[or-cvs] [torbutton/master 34/47] Update translations with new strings from pootle and the en template.

[mikeperry@xxxxxxxxxxxxxx]

Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date: Wed, 7 Apr 2010 02:30:43 -0700
Subject: Update translations with new strings from pootle and the en template.
Commit: 341cb5507a295284491cd652fe7ffca6c9a1f3cd

---
 src/chrome/locale/af/torbutton.dtd           |    7 ++
 src/chrome/locale/af/torbutton.properties    |    8 ++-
 src/chrome/locale/ar/torbutton.dtd           |   13 ++-
 src/chrome/locale/ar/torbutton.properties    |    8 ++-
 src/chrome/locale/bg/torbutton.dtd           |    7 ++
 src/chrome/locale/bg/torbutton.properties    |    8 ++-
 src/chrome/locale/bms/torbutton.dtd          |    7 ++
 src/chrome/locale/bms/torbutton.properties   |    8 ++-
 src/chrome/locale/bo/torbutton.dtd           |    7 ++
 src/chrome/locale/bo/torbutton.properties    |    8 ++-
 src/chrome/locale/ca/torbutton.dtd           |    7 ++
 src/chrome/locale/ca/torbutton.properties    |    8 ++-
 src/chrome/locale/cs/torbutton.dtd           |    7 ++
 src/chrome/locale/cs/torbutton.properties    |    8 ++-
 src/chrome/locale/da/torbutton.dtd           |   19 +++-
 src/chrome/locale/da/torbutton.properties    |   10 ++-
 src/chrome/locale/de/torbutton.dtd           |   19 +++-
 src/chrome/locale/de/torbutton.properties    |   30 ++++---
 src/chrome/locale/el/torbutton.dtd           |   53 ++++++-----
 src/chrome/locale/el/torbutton.properties    |   44 +++++----
 src/chrome/locale/es/torbutton.dtd           |   13 ++-
 src/chrome/locale/es/torbutton.properties    |   10 ++-
 src/chrome/locale/eu/torbutton.dtd           |    7 ++
 src/chrome/locale/eu/torbutton.properties    |    8 ++-
 src/chrome/locale/fa/torbutton.dtd           |    7 ++
 src/chrome/locale/fa/torbutton.properties    |    8 ++-
 src/chrome/locale/fi/torbutton.dtd           |   51 ++++++----
 src/chrome/locale/fi/torbutton.properties    |   16 ++-
 src/chrome/locale/fr/torbutton.dtd           |   19 +++-
 src/chrome/locale/fr/torbutton.properties    |   26 +++--
 src/chrome/locale/fur/torbutton.dtd          |    7 ++
 src/chrome/locale/fur/torbutton.properties   |    8 ++-
 src/chrome/locale/gl/torbutton.dtd           |    7 ++
 src/chrome/locale/gl/torbutton.properties    |    8 ++-
 src/chrome/locale/gu/torbutton.dtd           |    7 ++
 src/chrome/locale/gu/torbutton.properties    |    8 ++-
 src/chrome/locale/he/torbutton.dtd           |    7 ++
 src/chrome/locale/he/torbutton.properties    |    8 ++-
 src/chrome/locale/hi/torbutton.dtd           |    7 ++
 src/chrome/locale/hi/torbutton.properties    |    8 ++-
 src/chrome/locale/hr/torbutton.dtd           |    7 ++
 src/chrome/locale/hr/torbutton.properties    |    8 ++-
 src/chrome/locale/hu/torbutton.dtd           |    7 ++
 src/chrome/locale/hu/torbutton.properties    |    8 ++-
 src/chrome/locale/id/torbutton.dtd           |    7 ++
 src/chrome/locale/id/torbutton.properties    |    8 ++-
 src/chrome/locale/is/torbutton.dtd           |    7 ++
 src/chrome/locale/is/torbutton.properties    |    8 ++-
 src/chrome/locale/it/torbutton.dtd           |    7 ++
 src/chrome/locale/it/torbutton.properties    |    8 ++-
 src/chrome/locale/ja/torbutton.dtd           |    7 ++
 src/chrome/locale/ja/torbutton.properties    |    8 ++-
 src/chrome/locale/ka/torbutton.dtd           |    7 ++
 src/chrome/locale/ka/torbutton.properties    |    8 ++-
 src/chrome/locale/km/torbutton.dtd           |    7 ++
 src/chrome/locale/km/torbutton.properties    |    8 ++-
 src/chrome/locale/ko/torbutton.dtd           |    7 ++
 src/chrome/locale/ko/torbutton.properties    |    8 ++-
 src/chrome/locale/ku/torbutton.dtd           |    7 ++
 src/chrome/locale/ku/torbutton.properties    |    8 ++-
 src/chrome/locale/mt/torbutton.dtd           |    7 ++
 src/chrome/locale/mt/torbutton.properties    |    8 ++-
 src/chrome/locale/nb/torbutton.dtd           |   85 +++++++++-------
 src/chrome/locale/nb/torbutton.properties    |   34 ++++---
 src/chrome/locale/nl/torbutton.dtd           |   41 +++++---
 src/chrome/locale/nl/torbutton.properties    |    8 ++-
 src/chrome/locale/pa/torbutton.dtd           |    7 ++
 src/chrome/locale/pa/torbutton.properties    |    8 ++-
 src/chrome/locale/pl/torbutton.dtd           |   11 ++-
 src/chrome/locale/pl/torbutton.properties    |   12 ++-
 src/chrome/locale/pt-BR/torbutton.dtd        |   43 +++++----
 src/chrome/locale/pt-BR/torbutton.properties |    8 ++-
 src/chrome/locale/pt/torbutton.dtd           |   11 ++-
 src/chrome/locale/pt/torbutton.properties    |    8 ++-
 src/chrome/locale/ro/torbutton.dtd           |   53 ++++++-----
 src/chrome/locale/ro/torbutton.properties    |    8 ++-
 src/chrome/locale/ru/torbutton.dtd           |   19 +++-
 src/chrome/locale/ru/torbutton.properties    |   18 +++-
 src/chrome/locale/sl/torbutton.dtd           |  137 ++++++++++++++------------
 src/chrome/locale/sl/torbutton.properties    |   40 +++++---
 src/chrome/locale/sq/torbutton.dtd           |    7 ++
 src/chrome/locale/sq/torbutton.properties    |    8 ++-
 src/chrome/locale/sv/torbutton.dtd           |   15 ++-
 src/chrome/locale/sv/torbutton.properties    |    8 ++-
 src/chrome/locale/sw/torbutton.dtd           |    7 ++
 src/chrome/locale/sw/torbutton.properties    |    8 ++-
 src/chrome/locale/th/torbutton.dtd           |    7 ++
 src/chrome/locale/th/torbutton.properties    |    8 ++-
 src/chrome/locale/tr/torbutton.dtd           |    7 ++
 src/chrome/locale/tr/torbutton.properties    |    8 ++-
 src/chrome/locale/uk/torbutton.dtd           |    7 ++
 src/chrome/locale/uk/torbutton.properties    |    8 ++-
 src/chrome/locale/vi/torbutton.dtd           |   13 ++-
 src/chrome/locale/vi/torbutton.properties    |   24 +++--
 src/chrome/locale/zh-CN/torbutton.dtd        |   15 ++-
 src/chrome/locale/zh-CN/torbutton.properties |    8 ++-
 src/chrome/locale/zh-HK/torbutton.dtd        |    7 ++
 src/chrome/locale/zh-HK/torbutton.properties |    8 ++-
 src/chrome/locale/zh-TW/torbutton.dtd        |    7 ++
 src/chrome/locale/zh-TW/torbutton.properties |    8 ++-
 100 files changed, 1040 insertions(+), 390 deletions(-)

diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/af/torbutton.properties b/src/chrome/locale/af/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/af/torbutton.properties
+++ b/src/chrome/locale/af/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index 4f0aa70..9b1da8c 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -94,6 +94,13 @@
 <!ENTITY torbutton.prefs.no_proxies_on "Ù?ا برÙ?Ù?سÙ?ات Ù?Ù?:_">
 <!ENTITY torbutton.prefs.no_proxy_warning "تحذÙ?ر: تجÙ?ب استخداÙ? Ø£Ù? Ù?Ù? أسÙ?اء اÙ?Ù?ضÙ?Ù? اÙ?Ù?Ø°Ù?Ù?رة أعÙ?اÙ?">
 <!ENTITY torbutton.prefs.disable_livemarks "تعطÙ?Ù? اÙ?livemarks Ø®Ù?اÙ? إستعÙ?اÙ? تÙ?ر">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.dtd_recommended "(Ù?Ù?صÙ? بÙ?)">
+<!ENTITY torbutton.prefs.dtd_optional "(اختÙ?ارÙ?)">
+<!ENTITY torbutton.prefs.dtd_crucial "(Ø­Ù?رÙ?ج)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 80a40a9..83cddce 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = اÙ?Ù?ر Ù?تعطÙ?Ù? اÙ?Ù?Ù?Ø­Ù?ات
 torbutton.panel.label.disabled = تÙ?ر Ù?عطÙ?Ù?
 torbutton.panel.label.enabled = تÙ?ر Ù?Ù?عÙ?Ù?
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ù?Ù?Ù?ر Ù?Ù?تاح تÙ?ر تحÙ?Ù?ا سÙ?Ù?ا Ù?Ù? استخداÙ? Ù?Ù?رÙ?Ù?Ù?س Ù?Ù?سÙ?Ø· تÙ?ر
-torbutton.popup.history.warning = Ù?Ù?تاح تÙ?ر Ù?Ù?ع اÙ?تÙ?اعب بتغÙ?Ù?ر حاÙ?Ø© تارÙ?Ø® اÙ?تصÙ?Ø­. تÙ? Ù?ذا Ù?Ø­Ù? Ù?Ø´Ù?Ù?Ø© Ø£Ù?Ù?Ù?Ø© Ù?Ù? Ù?اÙ?رÙ?Ù?Ù?س.\n\nإضغط "إدخاÙ?" Ù?Ù? Ù?Ù?اÙ? اÙ?عÙ?Ù?اÙ? Ø£Ù? اÙ?تح صÙ?حة جدÙ?دة Ø£Ù? تبÙ?Ù?باÙ? جدÙ?داÙ? بدÙ?اÙ? عÙ? Ø°Ù?Ù?\n
+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 = Ù?Ù?ع Ù?Ù?تاح تÙ?ر تحÙ?Ù?Ù?ا Ù?باشرا Ù?Ù?حتÙ?Ù? Ù?Ù?Ø­Ù?Ø©.\n\nاستخدÙ? 'احÙ?ظ باسÙ?' بدÙ?ا عÙ? Ù?ذا.\n\n
 torbutton.popup.confirm_ca_certs = Ù?Ù?احظة Ù?Ù?تاح تÙ?ر: بÙ?ا Ø£Ù?Ù?Ù? Ù?ا تÙ?Ù?Ù? Ù?Ù?ثاÙ? إصدار اÙ?Ø´Ù?ادة اÙ?رÙ?Ù?Ù?Ø? Ù?Ø­Ù?Ø« Ø£Ù?Ù? عÙ?Ù?Ù?Ø© Ù?حص Ù?ائÙ?Ø© Ù?صدر اÙ?Ø´Ù?ادة اÙ?رÙ?Ù?Ù? عÙ?Ù?Ù?Ø© بطÙ?ئة Ù?تسبب بطئا Ù?Ù? عÙ?Ù? Ù?Ù?تاح تÙ?رØ? Ù?Ù?Ù? ترغب Ù?Ù? تعطÙ?Ù? عÙ?Ù?Ù?Ø© عزÙ? Ø´Ù?ادات اÙ?إصدار اÙ?رÙ?Ù?Ù?Ø? (Ø¥Ù? Ù?Ù?ت Ù?ا تعÙ?Ù? اÙ? Ù?ا تÙ?Ù?Ù? Ù?عÙ?Ù? Ø°Ù?Ù?Ø? Ù?Ø¥Ù?Ù? Ù?Ù? اÙ?Ù?ستحسÙ? Ø£Ù? تختار Ø®Ù?ار اÙ?Ù?Ù?اÙ?Ù?Ø©) 
 torbutton.popup.ff3.warning = تحذÙ?ر! \n\nÙ?Ù? اÙ?Ù?عرÙ?Ù? Ø£Ù? Ù?Ù?تاح تÙ?ر Ù?Ù? برÙ?اÙ?ج Ù?اÙ?رÙ?Ù?Ù?س 3 Ù?Ù?Ù?Ù? بتسرÙ?ب Ù?عÙ?Ù?Ù?ات عÙ? اÙ?Ù?Ù?Ø·Ù?Ø© اÙ?زÙ?Ù?Ù?Ø© اÙ?تÙ? Ø£Ù?ت Ù?Ù?Ù?ا Ù?عÙ? صÙ?حاتÙ? اÙ?Ù?Ù?ضÙ?Ø© اÙ?Ø­Ù?Ø©. \n\nÙ?Ù? ترغب باÙ?Ù?تابعة عÙ?Ù? Ø£Ù?Ù? حاÙ?Ø? 
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (حرج)
 torbutton.popup.external.title = تحÙ?Ù?Ù? Ù?حتÙ?Ù? خارجÙ?Ø?
 torbutton.popup.external.app = Ù?Ù?اÙ? حاجة Ù?استخداÙ? تطبÙ?Ù? خارجÙ? Ù?Ù?تعاÙ?Ù? Ù?ع:\n\n
 torbutton.popup.external.note = \n\nÙ?Ù?احظة: اÙ?تطبÙ?Ù?ات اÙ?خارجÙ?Ø© Ù?Ù?ست Ø¢Ù?Ù?Ø© Ù?ع تÙ?ر بشÙ?Ù? اÙ?تراضÙ? Ù?Ù?Ù?Ù?Ù? Ø£Ù? تÙ?Ø´Ù? Ù?Ù?Ù?تÙ?!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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 = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/bg/torbutton.properties b/src/chrome/locale/bg/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/bg/torbutton.properties
+++ b/src/chrome/locale/bg/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index d12727b..8edee93 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/bms/torbutton.properties b/src/chrome/locale/bms/torbutton.properties
index 184b31d..4737218 100644
--- a/src/chrome/locale/bms/torbutton.properties
+++ b/src/chrome/locale/bms/torbutton.properties
@@ -7,7 +7,7 @@ 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 = á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?? á?¡á?±á?»á??á?¡á?±á?? History á??á?¯á?­á??á?¹á??á?¼á??á?¹á??á?­á??á?¹á?¸á??á?­á??á?¹á?¸á??á?? á??á?¯á?­ Torbutton á??á?½ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á?«á??á??á?¹á??Firefox á??á?¶á?¯á?»á??á?¶á?³á??á?? bug á??á?¼á??á?¹ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?³á?­á??á?¹á??á??á?¹ á?»á??á??á?¹á??á?«á??á??á?¹á?? \n\nlocation box á?±á??á??á?¬á??á?¼á??á?¹ enter á??á?¯á?­ á??á?½á?­á??á?¹á??á?« á??á?­á?¯á??á??á??á?¯á??á?¹ window  á?¡á??á??á?¹á??á??á?¹á??á?¯ á??á?­á?¯á??á??á??á?¯á??á?¹ tab á??á??á?¹á??á?¯ á?¡á??á?¬á?¸á??á?­á?¯á?¸ á??á?¼á??á?¹á?·á??á?½á??á?¹á??á?«á?? \n\n
+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 = 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á??á??á?¹á??á?¯á?­á??á??á??á?¹á?»á??á??á?¹á?±á?? á?±á??á?½á??á??á?­á?¯á?? á??á??á?¹á??á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹ á??á?¯á?­á??á?«á??á??á?¬á?¸ ?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/bo/torbutton.properties b/src/chrome/locale/bo/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/bo/torbutton.properties
+++ b/src/chrome/locale/bo/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/cs/torbutton.properties
+++ b/src/chrome/locale/cs/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 0fcc185..27ec925 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Indstillinger">
 <!ENTITY torbutton.prefs.recommended_settings "Brug de anbefalede proxyindstillinger til min version af Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Brug Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Brug Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Brug brugerdefinerede proxyindstillinger">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
@@ -91,9 +91,16 @@
 <!ENTITY torbutton.prefs.tor_tabs "Faner blev indlæst i Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Ingen Proxies for:">
+<!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: Undgå at bruge enhver værtsnavne ovenfor">
 <!ENTITY torbutton.prefs.disable_livemarks "Deaktiver opdatering af livemarks, når Tor kører">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.dtd_recommended "(anbefalet)">
+<!ENTITY torbutton.prefs.dtd_optional "(Valg frit)">
+<!ENTITY torbutton.prefs.dtd_crucial "(Vigtigt)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 093314c..1c7535d 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -7,13 +7,13 @@ torbutton.panel.plugins.enabled = Klik for at deaktivere plugins
 torbutton.panel.label.disabled = Tor Deaktiveret
 torbutton.panel.label.enabled = Tor Aktiveret
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton gør det nemt at aktivere og deaktivere Tor Proxyen ved brug af Firefox
-torbutton.popup.history.warning = Torbutton har blokeret historik skift manipulation. Dette er for at omgå en Firefox sikkerheds fejl.\n\nTryk på 'return' i adresse boksen eller åben en ny fane eller browservindue i stedet.\n\n
+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 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 FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.failure = Tor proxy test MISLYKKEDES! Kontroller dine proxy og Privoxy indstillinger.
 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 = 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
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (afgørende)
 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 5650e0f..7ad0f1c 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy-Einstellungen">
 <!ENTITY torbutton.prefs.recommended_settings "Benutze die empfohlenen Proxy-Einstellungen für meine Firefox-Version">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy verwenden">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Polipo verwenden">
 <!ENTITY torbutton.prefs.custom_settings "Individuelle Proxy-Einstellungen verwenden">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL-Proxy:">
@@ -91,9 +91,16 @@
 <!ENTITY torbutton.prefs.tor_tabs "Im Tor-Modus geladene Tabs">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.disable_livemarks "Deaktiviere Aktualisierungen der Livemarks während der Benutzung von Tor.">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.no_proxies_on "Keine Proxies für: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Warnung: Vermeiden Sie es, oben irgendwelche Host Namen zu verwenden">
+<!ENTITY torbutton.prefs.disable_livemarks "Aktualisierungen von Livemarks während der Benutzung von Tor deaktivieren.">
+<!ENTITY torbutton.prefs.dtd_recommended "(empfohlen)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.dtd_crucial "(kritisch)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 9d27c53..87e994a 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -7,24 +7,30 @@ torbutton.panel.plugins.enabled = Klicken, um Plugins zu deaktivieren
 torbutton.panel.label.disabled = Tor deaktiviert
 torbutton.panel.label.enabled = Tor aktiviert
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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 = Der Inhalt des Plugins konnte nicht direkt heruntergeladen werden, weil Torbutton dies verhinderte.\n\nBitte stattdessen "Speichern als" verwenden.\n
 torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene Zertifikatsautoritäten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen Zertifikationsautoritäten-Liste 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 = Warnung!\n\nEs ist bekannt, dass Torbutton auf Firefox 3 deine Zeitzone und Livemarks via Tor mitteilt.\n\nWillst du trotzem fortfahren?
 torbutton.popup.toggle.warning = Die Einstellungen werden erst nach einem Neustart von Tor wirksam
 torbutton.popup.test.success = Tor-Proxy Test erfolgreich!
-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 = Klicke OK zum Testen der Proxyeinstellungen. Dieser Test arbeitet im Hintergrund. Bitte warte einen Augenblick.
+torbutton.popup.test.failure = Tor Proxy Test FEHLGESCHLAGEN! �berprüfen Sie Ihre Proxy- und Polipo-Einstellungen.
+torbutton.popup.test.confirm_toggle = Der letzte Tor Proxy Test 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 Fenster Torbutton Proxy Einstellungen wiederholen, um diese Warnung zu löschen.
+torbutton.popup.test.ff3_notice = Klicken Sie OK um die Proxyeinstellungen zu testen. Dieser Test arbeitet im Hintergrund. Bitte warten Sie einen Augenblick.
 torbutton.panel.label.verified = Tor überprüft
-torbutton.popup.test.auto_failed = Der automatische Tor Proxy Test ist fehlgeschlagen.\n\nBist du dir sicher ihn trozdem zu aktivieren?
+torbutton.popup.test.auto_failed = Der automatische Tor Proxy Test 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 = 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
-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.external.title = Externen Inhalt laden?
+torbutton.popup.external.app = Eine externe Applikation wird benötigt, um mit dem folgenden Objekt umzugehen:\n\n
+torbutton.popup.external.note = \n\nAnmerkung: Externe Applikationen sind im Allgemeinen NICHT Tor gesichert und können Sie verraten!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.launch = Applikation starten
+torbutton.popup.cancel = Abbrechen
+torbutton.popup.dontask = Von nun an immer Applikationen laden
+torbutton.popup.test.no_http_proxy = Tor proxy test: Lokaler HTTP Proxy ist unerreichbar. Läuft Polipo korrekt?
+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/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 1259b5b..1103a85 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -46,7 +46,7 @@
 <!ENTITY torbutton.prefs.set_uagent "Î?Ï?ιÏ?μÏ?Ï? user agent για Ï?Ï?ήÏ?η  Tor (κÏ?ίÏ?ιμο)">
 <!ENTITY torbutton.prefs.dynamic "Î?Ï?ναμικÏ? Ï?εÏ?ιεÏ?Ï?μενο">
 <!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Î?ανθάνοÏ?Ï?α">
+<!ENTITY torbutton.prefs.cache "Î Ï?οÏ?Ï?Ï?ινή μνήμη cache">
 <!ENTITY torbutton.prefs.history "Î?Ï?Ï?οÏ?ικÏ?">
 <!ENTITY torbutton.prefs.no_search "Î?Ï?ενεÏ?γοÏ?οίηÏ?η Ï?Ï?μβοÏ?λÏ?ν αναζήÏ?ηÏ?ηÏ? καÏ?ά Ï?η Ï?Ï?ήÏ?η Tor (Ï?Ï?νιÏ?Ï?άÏ?αι)">
 <!ENTITY torbutton.prefs.shutdown "Î?λείÏ?ιμο">
@@ -55,7 +55,7 @@
 <!ENTITY torbutton.prefs.no_shutdown "Î?α μην γίνει εκκαθάÏ?ιÏ?η cookies καÏ?ά Ï?ο κλείÏ?ιμο">
 <!ENTITY torbutton.prefs.disable_sessionstore "Î?Ï?ενεÏ?γοÏ?οίηÏ?η αÏ?οθήκεÏ?Ï?ηÏ? Ï?Ï?νεδÏ?ίαÏ? (Ï?Ï?νιÏ?Ï?άÏ?αι)">
 <!ENTITY torbutton.prefs.headers "Î?εÏ?αλίδεÏ?">
-<!ENTITY torbutton.prefs.spoof_english "ΠλαÏ?Ï?ογÏ?άÏ?ηÏ?η γλÏ?Ï?Ï?αÏ? Ï?εÏ?ιηγηÏ?ή (Ï?ε US English)">
+<!ENTITY torbutton.prefs.spoof_english "ΠαÏ?αÏ?λάνηÏ?η Ï?ηÏ? γλÏ?Ï?Ï?αÏ? US English Ï?οÏ? ΠεÏ?ιηγηÏ?ή">
 <!ENTITY torbutton.prefs.disable_referer "Î?α μην αÏ?οÏ?Ï?έλεÏ?αι referer καÏ?ά Ï?η Ï?Ï?ήÏ?η Tor (μÏ?οÏ?εί να μην λειÏ?οÏ?Ï?γοÏ?ν Ï?Ï?Ï?Ï?ά οÏ?ιÏ?μένοι ιÏ?Ï?Ï?Ï?οÏ?οι)">
 <!ENTITY torbutton.prefs.disable_domstorage "Î?Ï?ενεÏ?γοÏ?οίηÏ?η αÏ?οθήκεÏ?Ï?ηÏ? DOM καÏ?ά Ï?η Ï?Ï?ήÏ?η Tor (κÏ?ίÏ?ιμο)">
 <!ENTITY torbutton.prefs.forms "ΦÏ?Ï?μεÏ?">
@@ -63,8 +63,8 @@
 <!ENTITY torbutton.prefs.block_ntforms "Î?Ï?λοκάÏ?ιÏ?μα αÏ?οθήκεÏ?Ï?ηÏ? κÏ?δικÏ?ν + δεδομένÏ?ν Ï?οÏ?μÏ?ν εκÏ?Ï?Ï? Tor (Ï?Ï?οαιÏ?εÏ?ικÏ?)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "ΧÏ?Ï?ίÏ? Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Î?Ï?αναÏ?Ï?Ï?Ï?Ï?Ï?η cookie jar/ εκκαθάÏ?ιÏ?η cookiew Ï?ε καÏ?άÏ?Ï?εÏ?Ï?η Ï?οÏ? Firefox (Ï?Ï?νιÏ?Ï?άÏ?αι)">
+<!ENTITY torbutton.prefs.restore_tor "Î?Ï?αν γίνεÏ?αι εκκίνηÏ?η με αÏ?οκαÏ?άÏ?Ï?αÏ?η Ï?ηÏ? Ï?Ï?νεδÏ?ίαÏ?, Ï?οÏ?οθέÏ?ηÏ?η Ï?οÏ? Tor Ï?ε καÏ?άÏ?Ï?αÏ?η:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Î?Ï?αναÏ?Ï?Ï?Ï?Ï?Ï?η cookie jar/ εκκαθάÏ?ιÏ?η cookiew Ï?ε Ï?εÏ?ίÏ?Ï?Ï?Ï?η καÏ?άÏ?Ï?εÏ?Ï?ηÏ? Ï?οÏ? Firefox (Ï?Ï?νίÏ?Ï?αÏ?αι)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Î?Ï?οθήκεÏ?Ï?η cookies αÏ?Ï? και εκÏ?Ï?Ï? Tor Ï?ε Ï?Ï?οÏ?Ï?αÏ?εÏ?μένα αÏ?Ï?εία jar (εÏ?ικίνδÏ?νο)">
 <!ENTITY torbutton.prefs.clear_http_auth "Î?κκαθάÏ?ιÏ?η Ï?ιÏ?Ï?οÏ?οιημένÏ?ν  Ï?Ï?νεδÏ?ιÏ?ν HTTP (Ï?Ï?νιÏ?Ï?άÏ?αι)">
 <!ENTITY torbutton.prefs.block_js_history "Î?Ï?ομÏ?νÏ?Ï?η Ï?Ï?Ï?Ï?βαÏ?ηÏ? Ï?Ï?ο ιÏ?Ï?οÏ?ικÏ? Ï?εÏ?ιήγηÏ?ηÏ? ανά καÏ?άÏ?Ï?αÏ?η Tor (κÏ?ίÏ?ιμο)">
@@ -74,26 +74,33 @@
 <!ENTITY torbutton.prefs.block_links "Î?Ï?λοκάÏ?ιÏ?μα κλικ Ï?ε δεÏ?μοÏ?Ï? και ανανέÏ?Ï?ηÏ? Ï?ελίδÏ?ν αÏ?Ï? διαÏ?οÏ?εÏ?ικέÏ? καÏ?αÏ?Ï?άÏ?ειÏ? λειÏ?οÏ?Ï?γίαÏ? Tor (Ï?Ï?οαιÏ?εÏ?ικÏ?)">
 <!ENTITY torbutton.prefs.jar_certs "Î?Ï?οθήκεÏ?Ï?η Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν SSL Ï?ε ξεÏ?Ï?Ï?ιÏ?Ï?ά αÏ?Ï?εία jar για Ï?Ï?ήÏ?η με Tor/Ï?Ï?Ï?ίÏ? Tor (Ï?Ï?νιÏ?Ï?άÏ?αι)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Î?Ï?οθήκεÏ?Ï?η Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν CA Ï?ε ξεÏ?Ï?Ï?ιÏ?Ï?ά αÏ?Ï?εία jar για Ï?Ï?ήÏ?η με Tor/Ï?Ï?Ï?ίÏ? Tor (Ï?Ï?νιÏ?Ï?άÏ?αι)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.locked_mode "Î?Ï?ενεÏ?γοÏ?οίηÏ?η Î?οÏ?μÏ?ιοÏ? και ΣÏ?νÏ?ομεÏ?Ï?εÏ?ν Ï?λήκÏ?Ï?Ï?ν για αÏ?οÏ?Ï?γή αÏ?Ï?οÏ?Ï?εδίαÏ?Ï?ηÏ? εναλλαγήÏ?">
+<!ENTITY torbutton.prefs.startup_state "Î?Ï?αν γίνει κανονική εκκίνηÏ?η, Ï?οÏ?οθέÏ?ηÏ?η Ï?οÏ? Tor Ï?ε καÏ?άÏ?Ï?αÏ?η:">
+<!ENTITY torbutton.prefs.shutdown_state "Î?αÏ?άÏ?Ï?αÏ?η διακοÏ?ήÏ? λειÏ?οÏ?Ï?γίαÏ?">
+<!ENTITY torbutton.prefs.startup "Î?κκίνηÏ?η">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Î?Ï?αγÏ?Ï?εÏ?Ï?η Ï?Ï?Ï?Ï?βαÏ?ηÏ? Ï?Ï?ο δίκÏ?Ï?ο με μη Tor Ï?Ï?Ï?Ï?βαÏ?η αÏ?Ï? URLs Ï?ηÏ? μοÏ?Ï?ήÏ? file://">
+<!ENTITY torbutton.prefs.restore_defaults "Î?Ï?οκαÏ?άÏ?Ï?αÏ?η αÏ?Ï?ικÏ?ν Ï?Ï?θμίÏ?εÏ?ν">
+<!ENTITY torbutton.prefs.test_settings "Î?λεγÏ?οÏ? Ï?Ï?θμίÏ?εÏ?ν">
+<!ENTITY torbutton.prefs.test_auto "Î?α γίνεÏ?αι έλεγÏ?οÏ? Ï?Ï?ν Ï?Ï?θμίÏ?εÏ?ν Ï?οÏ? Tor μεÏ?ά Ï?ην Ï?Ï?Ï?Ï?η εναλλαγή, κάθε Ï?οÏ?ά Ï?οÏ? εκκινεί ο Firefox">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Î?α μην γÏ?άÏ?ονÏ?αι Tor cookies Ï?Ï?ον δίÏ?κο">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Î?α μην γÏ?άÏ?ονÏ?αι μη Tor cookies Ï?Ï?ον δίÏ?κο">
+<!ENTITY torbutton.prefs.session_restore "Î?Ï?οθήκεÏ?Ï?η Ï?ηÏ? Ï?Ï?νεδÏ?ίαÏ? και εÏ?αναÏ?οÏ?ά Ï?Ï?ν εξήÏ? καÏ?Ï?ελÏ?ν:">
+<!ENTITY torbutton.prefs.nontor_tabs "Î?αÏ?Ï?έλεÏ? Ï?οÏ? Ï?οÏ?Ï?Ï?νονÏ?αι Ï?ε μη Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Î?αÏ?Ï?έλεÏ? Ï?οÏ? Ï?οÏ?Ï?Ï?νονÏ?αι Ï?Ï?ο Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.no_proxies_on "Î?εν Ï?Ï?άÏ?Ï?οÏ?ν Ï?ληÏ?εξοÏ?Ï?ιοι διακομιÏ?Ï?έÏ? proxy για:">
+<!ENTITY torbutton.prefs.no_proxy_warning "Î?ιδοÏ?οίηÏ?η: Î?Ï?οÏ?Ï?γεÏ?ε Ï?ην  Ï?Ï?ήÏ?η hostnames Ï?ιο Ï?άνÏ?">
+<!ENTITY torbutton.prefs.disable_livemarks "Î?Ï?ενεÏ?γοÏ?οίηÏ?η Ï?Ï?ν ενημεÏ?Ï?Ï?εÏ?ν Ï?οÏ? livemark Ï?Ï?ο Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι Ï?ο Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(Ï?Ï?νίÏ?Ï?αÏ?αι)">
+<!ENTITY torbutton.prefs.dtd_optional "(Ï?Ï?οεÏ?αιÏ?ικÏ?)">
+<!ENTITY torbutton.prefs.dtd_crucial "(κÏ?ίÏ?ιμο)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties
index c1e28c2..500b501 100644
--- a/src/chrome/locale/el/torbutton.properties
+++ b/src/chrome/locale/el/torbutton.properties
@@ -7,24 +7,30 @@ torbutton.panel.plugins.enabled = Î?άνÏ?ε κλικ για αÏ?ενεÏ?γοÏ?
 torbutton.panel.label.disabled = Το Tor είναι αÏ?ενεÏ?γοÏ?οιημένο
 torbutton.panel.label.enabled = Το Tor είναι ενεÏ?γοÏ?οιημένο
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Το Torbutton Ï?Ï?οÏ?θέÏ?ει ένα κοÏ?μÏ?ί για εÏ?κολη διαÏ?είÏ?ιÏ?η Ï?ηÏ? ανακαÏ?εÏ?θÏ?νÏ?ηÏ? Ï?οÏ? Firefox Ï?Ï?ον διαμεÏ?ολαβηÏ?ή Tor
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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 μÏ?λοκάÏ?ιÏ?ε Ï?ην άμεÏ?η Ï?Ï?Ï?Ï?Ï?Ï?η μέÏ?Ï? Ï?εÏ?ιεÏ?Ï?μενοÏ? Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ?.\n\nΧÏ?ηÏ?ιμοÏ?οιήÏ?Ï?ε Ï?η λειÏ?οÏ?Ï?γία «Î?Ï?οθήκεÏ?Ï?η Ï?Ï?» ανÏ?ί γι' αÏ?Ï?Ï?.\n\n
 torbutton.popup.confirm_ca_certs = ΣημείÏ?Ï?η Torbutton: ΦαίνεÏ?αι Ï?Ï?Ï? δεν διαθέÏ?εÏ?ε Ï?Ï?οÏ?αÏ?μοζμένεÏ? αÏ?Ï?έÏ? Ï?ιÏ?Ï?οÏ?οίηÏ?ηÏ? (CA) Î? έλεγÏ?οÏ? Ï?ηÏ? λίÏ?Ï?αÏ? αÏ?Ï?Ï?ν Ï?ιÏ?Ï?οÏ?οίηÏ?ηÏ? είναι Ï?Ï?ονοβÏ?Ï?α διαδικαÏ?ία και καθÏ?Ï?Ï?εÏ?εί Ï?ην εναλλαγή Ï?οÏ? Tor. Î?έλεÏ?ε να αÏ?ενεÏ?γοÏ?οιηθεί η αÏ?ομÏ?νοÏ?η Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν CA; (αν δεν καÏ?αλαβαίνεÏ?ε Ï?ο μήνÏ?μα, μÏ?οÏ?είÏ?ε να κάνεÏ?ε κλικ Ï?Ï?ο Î?Î? με αÏ?Ï?άλεια)
-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
-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.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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.launch = Î?κÏ?έλεÏ?η εÏ?αÏ?μογήÏ?
+torbutton.popup.cancel = Î?κÏ?Ï?ον
+torbutton.popup.dontask = Î?Ï?Ï? Ï?Ï?Ï?α και Ï?Ï?ο εξήÏ? να εκÏ?ελοÏ?νÏ?αι Ï?άνÏ?οÏ?ε εÏ?αÏ?μογέÏ?
+torbutton.popup.test.no_http_proxy = Î?οκιμή Tor proxy: Î? Ï?οÏ?ικÏ?Ï? HTTP Proxy είναι αÏ?Ï?Ï?Ï?ιÏ?οÏ?. Î?κÏ?ελείÏ?αι Ï?Ï?Ï?Ï?ά Ï?ο Polipo;
+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/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 0433883..cf758cd 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Configuración del Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar la configuración de proxy recomendada para mi versión de Firefox.">
 <!ENTITY torbutton.prefs.use_privoxy "Usar Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Usar Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Usar una configuración de proxy personalizada">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
@@ -94,6 +94,13 @@
 <!ENTITY torbutton.prefs.no_proxies_on "No hay proxies para:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.prefs.disable_livemarks "Deshabilitar las marcas de actualizaciones durante el uso de Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
+<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index e498431..6fa358a 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Haga clic para deshabilitar componentes.
 torbutton.panel.label.disabled = Tor deshabilitado
 torbutton.panel.label.enabled = Tor habilitado
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton proporciona un botón para habilitar y deshabilitar el acceso al proxy Tor desde el Firefox de manera fácil.
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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 bloqueó la carga directa por Tor del contenido de un componente.\n\nUse la alternativa de â??Guardar Comoâ??.\n\n
 torbutton.popup.confirm_ca_certs = Nota de Torbutton: Parece que usted no tiene Autoridades de Certificado personalizadas. Examinar el listado de Autoridades de Certificado es una operación lenta y hace más lento el conmutador Tor. ¿Desea deshabilitar el aislamiento de los certificados de Autoridades de Certificado? (Si no entiende esto, se más seguro hacer clic en Aceptar)
 torbutton.popup.ff3.warning = ¡Advertencia!\\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona horaria y la marcas a través de Tor.\\n\\n¿Desea continuar de todos modos?\n
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Cargar contenido externo?
 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 torbutton.popup.launch = Iniciar la aplicación
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = A partir de ahora, siempre iniciar la aplicación
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.test.no_http_proxy = Prueba de Tor proxy: Local Proxy HTTP es inalcanzable. Polipo está funcionando correctamente?
+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/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 7dc6fb5..211d84d 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index b435815..0fba1b2 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = براÛ? غÛ?رÙ?عاÙ? کردÙ? Ù¾Ù?اگÛ?Ù?
 torbutton.panel.label.disabled = تÙ?رغÛ?رÙ?عاÙ? شد
 torbutton.panel.label.enabled = تÙ?ر Ù?عاÙ? شد
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = دکÙ?Ù? تÙ?ر بÙ? آساÙ?Û? اÙ?کاÙ? Ù?عاÙ? Ù? غÛ?رÙ?عاÙ? کردÙ? پراکسÛ? تÙ?ر را بکÙ?Ú© Û?Ú© دکÙ?Ù? Ù?Û? دÙ?د
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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 = دکÙ?Ù? تÙ?ر Ù?اÙ?ع از Ù?صب Ø®Ù?دکار Û?Ú© Ù¾Ù?اگÛ?Ù? شد.\n\nدر عÙ?ض ذخÛ?رÙ? با Ù?اÙ? را بکار ببرÛ?د.\n\n
 torbutton.popup.confirm_ca_certs = Û?ادداشت دکÙ?Ù? تÙ?ر: بÙ?ظر Ù?Û?رسد Ú©Ù? Ø´Ù?ا داراÛ? اسÙ?اد سÙ?ارشÛ? Ù?Ù?Û? باشÛ?د. بازرسÛ? Ù?Û?ست اسÙ?اد زÙ?اÙ? Ù?Û? برد Ù? Ù?Ù?جب Ú©Ù?دÛ? عÙ?Ù?کرد ضاÙ?Ù? تÙ?ر Ù?Û? Ø´Ù?د. Ø¢Û?ا Ù?Û? Ø®Ù?اÙ?Û?د جداسازÛ? اسÙ?اد را غÛ?رÙ?عاÙ? Ú©Ù?Û?دØ? (اگر Ù?تÙ?جÙ? Ù?عÙ?Û? Ù?Ù?Û? Ø´Ù?Û?د, بÙ?تر است رÙ?Û? بسÛ?ارخÙ?ب Ù?شار دÙ?Û?د)
 torbutton.popup.ff3.warning = Ù?شدار!\n\nدکÙ?Ù? تÙ?ر در Ù?اÛ?رÙ?اکس 3 Ù?حدÙ?دÙ? زÙ?اÙ?Û? Ù? بÙ?Ú© Ù?ارک Ù?ا را از طرÛ?Ù? تÙ?راÙ?شا Ù?Û?Ú©Ù?د.\n\nØ¢Û?ا در Ù?ر صÙ?رت Ù?اÛ?Ù? بÙ? اداÙ?Ù? Ù?ستÛ?دØ?
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (بسÛ?ار Ù?Ù?Ù?)
 torbutton.popup.external.title = Ù?حتÙ?Û?ات خارجÛ? بارگزارÛ? Ø´Ù?Ù?دØ?
 torbutton.popup.external.app = Û?Ú© برÙ?اÙ?Ù? خارجÛ? باÛ?د Ù?ارد عÙ?Ù? Ø´Ù?د:\n\n
 torbutton.popup.external.note = \n\nÙ?کتÙ?: برÙ?اÙ?Ù? Ù?اÛ? خارجÛ? تÙ?سط تÙ?ر بÙ? Ø·Ù?ر Ù¾Û?Ø´Ù?رض اÙ?Ù? Ù?شدÙ? اÙ?د Ù? Ù?Ù?Ú©Ù? است Ù?Ù?Û?ت اصÙ?Û? Ø´Ù?ا را آشکار Ú©Ù?Ù?د!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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 = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index 0a2427e..68e5efb 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -1,6 +1,6 @@
 <!ENTITY torbutton.prefs.title "Torbutton Asetukset">
 <!ENTITY torbutton.prefs.display_settings "Ulkoasu">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
+<!ENTITY torbutton.prefs.display_panel "Näytä Tor-välityspalvelimen asetukset tilarivillä">
 <!ENTITY torbutton.prefs.panel_format "Tilapalkin ulkoasu:">
 <!ENTITY torbutton.prefs.panel_text_format "Teksti">
 <!ENTITY torbutton.prefs.panel_icon_format "Kuva">
@@ -16,7 +16,7 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-palvelin:">
 <!ENTITY torbutton.prefs.proxy.port "Portti:">
 <!ENTITY torbutton.about.title "Tietoja Torbuttonista">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
+<!ENTITY torbutton.pref_connection.notice "Poista Torbutton käytöstä muuttaakseen asetukset.">
 <!ENTITY torbutton.pref_connection.more_info "Lisää tietoja">
 <!ENTITY torbutton.pref_connection_more_info.title "Apua">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
@@ -29,17 +29,17 @@
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Turvallisuus">
-<!ENTITY torbutton.prefs.block_thread "Estä historiatietojen lukeminen Torin ollessa käytössä. (Tärkeää)">
-<!ENTITY torbutton.prefs.block_thwrite "Estä historiatietojen tallentaminen Torin ollessa käytössä. (Suositeltua)">
-<!ENTITY torbutton.prefs.block_nthread "Estä historiatietojen lukeminen Torin ollessa pois käytöstä. (Vapaaehtoista)">
-<!ENTITY torbutton.prefs.block_nthwrite "Estä historiatietojen tallentaminen Torin ollessa pois käytöstä. (Vapaaehtoista)">
-<!ENTITY torbutton.prefs.clear_history "Tyhjennä historiatiedot vaihdettaessa Tor-käytön tilaa. (Vapaaehtoista)">
+<!ENTITY torbutton.prefs.block_thread "Estä historiatietojen lukeminen Torin ollessa käytössä. (tärkeää)">
+<!ENTITY torbutton.prefs.block_thwrite "Estä historiatietojen tallentaminen Torin ollessa käytössä. (suositeltua)">
+<!ENTITY torbutton.prefs.block_nthread "Estä historiatietojen lukeminen Torin ollessa pois käytöstä. (valinnaista)">
+<!ENTITY torbutton.prefs.block_nthwrite "Estä historiatietojen tallentaminen Torin ollessa pois käytöstä. (valinnaista)">
+<!ENTITY torbutton.prefs.clear_history "Tyhjennä historiatiedot vaihdettaessa Tor-käytön tilaa. (valinnaista)">
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Estä levyn ja muistin välimuistiin pääsy Torin ollessa käytössä.">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "Huolehdin evästeistä käsin. (Vaarallista)">
+<!ENTITY torbutton.prefs.mmm_cookies "Huolehdin evästeistä käsin. (vaarallista)">
 <!ENTITY torbutton.prefs.clear_cookies "Poista evästeet vaihdettaessa Tor-käytön tilaa.">
-<!ENTITY torbutton.prefs.disable_plugins "Poista lisäosat toiminnasta Torin ollessa käytössä. (Tärkeää)">
+<!ENTITY torbutton.prefs.disable_plugins "Poista lisäosat toiminnasta Torin ollessa käytössä (tärkeää)">
 <!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
 <!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
 <!ENTITY torbutton.prefs.no_updates "Estä päivitykset Torin ollessa käytössä.">
@@ -51,16 +51,16 @@
 <!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown "Sammuta">
 <!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Poista evästeet selaimen lopettaessa">
+<!ENTITY torbutton.prefs.no_shutdown "�lä poista evästeitä lopettaessa">
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Otsikko">
+<!ENTITY torbutton.prefs.headers "Tunnistetiedot">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
 <!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.prefs.disable_domstorage "Poista DOM-säilytys käytöstä kun Tor on käynnissä (kriittinen)">
 <!ENTITY torbutton.prefs.forms "Lomakkeet">
 <!ENTITY torbutton.prefs.block_tforms "Estä salasana+lomake tallennus kun Tor on käytössä (suositeltu)">
-<!ENTITY torbutton.prefs.block_ntforms "Estä salasana+lomake tallennus kun Tor ei ole käytössä (vaihtoehtoinen)">
+<!ENTITY torbutton.prefs.block_ntforms "Estä salasana+lomake tallennus kun Tor ei ole käytössä (valinnainen)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
@@ -69,16 +69,16 @@
 <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
 <!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Sulje kaikki Tor ikkunat ja välilehdet kun Tor poistetaan käytöstä (vaihtoehtoinen)">
-<!ENTITY torbutton.prefs.close_nontor "Sulje kaikki ikkunat ja välilehdet jotka eivät ole Tor ikkunoita tai välilehtiä kun Tor otetaan käyttöön (vaihtoehtoinen)">
+<!ENTITY torbutton.prefs.close_tor "Sulje kaikki Tor ikkunat ja välilehdet kun Tor poistetaan käytöstä (valinnainen)">
+<!ENTITY torbutton.prefs.close_nontor "Sulje kaikki ikkunat ja välilehdet jotka eivät ole Tor ikkunoita tai välilehtiä kun Tor otetaan käyttöön (valinnainen)">
 <!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
 <!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
 <!ENTITY torbutton.prefs.locked_mode "Poista painike ja pikanäppäimet käytöstä estääkseen tahatonta käyttöönottoa/käytöstä poistamista">
 <!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.shutdown_state "Lopetustila">
 <!ENTITY torbutton.prefs.startup "Käynnistys">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_tor_file_net "Estä Tor-toiminnan pääsy osoitteisiin file:// (suositellaan)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Palauta Oletukset">
 <!ENTITY torbutton.prefs.test_settings "Koeta Asetuksia">
@@ -91,9 +91,16 @@
 <!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Ei välityspalvelimia osoitteille:">
+<!ENTITY torbutton.prefs.no_proxy_warning "Varoitus: Vältä yllä olevia osoitteita">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.dtd_recommended "(suositeltu)">
+<!ENTITY torbutton.prefs.dtd_optional "(valinnainen)">
+<!ENTITY torbutton.prefs.dtd_crucial "(kriittinen)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index 90db0fb..678bb5a 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -7,24 +7,30 @@ 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.{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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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.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 = 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.panel.label.verified = Tor varmistettu
 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 = (suositeltu)
-torbutton.prefs.optional = (vaihtoehtoinen)
+torbutton.prefs.optional = (valinnainen)
 torbutton.prefs.crucial = (kriittinen)
 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 8873a64..81f6d07 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Paramètres du proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramètres de proxy recommandés pour ma version de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Utiliser Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Utiliser Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Utiliser des paramètres de proxy personnalisés">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
@@ -91,9 +91,16 @@
 <!ENTITY torbutton.prefs.tor_tabs "Onglets chargés en mode Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Pas de Proxy pour: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Attention: �vitez d'utiliser les noms d'hôtes ci-dessus">
 <!ENTITY torbutton.prefs.disable_livemarks "Désactiver les marques-pages dynamiques durant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommandé)">
+<!ENTITY torbutton.prefs.dtd_optional "(optionnel)">
+<!ENTITY torbutton.prefs.dtd_crucial "(essentiel)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 072ad79..5e6cf2b 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -7,24 +7,30 @@ torbutton.panel.plugins.enabled = Cliquer pour désactiver les plugins
 torbutton.panel.label.disabled = Tor Inactif
 torbutton.panel.label.enabled = Tor Actif
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton fournit un bouton qui permet d'activer et de désactiver rapidement le pointage de Firefox vers le proxy de Tor
-torbutton.popup.history.warning = Torbutton a bloqué la manipulation de changement d'état de l'historique. C'est la correction d'un bug de secrité de Firefox.\n\nTapez 'entrée' dans la barre d'adresse ou autrement ouvrez une nouvelle fenêtre ou une nouvel onglet.\n\n
+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 a bloqué le chargement direct par Tor de contenu de 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 laisser échapper 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 = 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.failure = ECHEC du test du proxy Tor ! Vérifiez votre configuration de proxy et de Polipo.
+torbutton.popup.test.confirm_toggle = Le dernier test de proxy Tor a échoué.\n\nEtes-vous sure 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 = 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
-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.external.title = Charger un contenu externe ?
+torbutton.popup.external.app = Une application externe est requise pour gérer:\n\n
+torbutton.popup.external.note = \n\nNOTE: Les applicatiosn externes ne sont pas saines par défaut pour Tor et peuvent vous démasquer !\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.launch = Lancer l'application
+torbutton.popup.cancel = Annuler
+torbutton.popup.dontask = Toujours lancer les applications à partir de maintenant
+torbutton.popup.test.no_http_proxy = Test du proxy Tor: Le proxy HTTP localLocalest injoignable. Est-ce-que Polipo fonctionne correctement ?
+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/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/fur/torbutton.properties b/src/chrome/locale/fur/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/fur/torbutton.properties
+++ b/src/chrome/locale/fur/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/gl/torbutton.properties b/src/chrome/locale/gl/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/gl/torbutton.properties
+++ b/src/chrome/locale/gl/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/gu/torbutton.properties b/src/chrome/locale/gu/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/gu/torbutton.properties
+++ b/src/chrome/locale/gu/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index a6c9984..77c14ac 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/hi/torbutton.properties b/src/chrome/locale/hi/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/hi/torbutton.properties
+++ b/src/chrome/locale/hi/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 2858c5c..13f88c0 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/hr/torbutton.properties b/src/chrome/locale/hr/torbutton.properties
index 9e59561..a169a14 100644
--- a/src/chrome/locale/hr/torbutton.properties
+++ b/src/chrome/locale/hr/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor onemoguÄ?en
 torbutton.panel.label.enabled = Tor omoguÄ?en
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton omoguÄ?ava gumb za lakÅ¡e omoguÄ?avanje ili onemoguÄ?avanje tor proxy-a
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/hu/torbutton.properties
+++ b/src/chrome/locale/hu/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 48c6241..43f03e7 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index 3a64f8b..16b9864 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Fai clic per disattivare i plugin
 torbutton.panel.label.disabled = Tor disattivato
 torbutton.panel.label.enabled = Tor attivato
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = L'estensione Torbutton fornisce un pulsante per attivare e disattivare facilmente l'uso del proxy Tor in Firefox
-torbutton.popup.history.warning = Torbutton ha bloccato la modifica della cronologia fatta in stati diversi. Questo serve ad aggirare un baco di sicurezza di Firefox.\n\nFai clic su 'invio' nella barra degli indirizzi oppure apri una nuova finestra od una nuova scheda.\n\n
+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 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 ancora attivando/disattivando 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?
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (essenziale)
 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/ka/torbutton.properties
+++ b/src/chrome/locale/ka/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/km/torbutton.properties b/src/chrome/locale/km/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/km/torbutton.properties
+++ b/src/chrome/locale/km/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/ku/torbutton.properties b/src/chrome/locale/ku/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/ku/torbutton.properties
+++ b/src/chrome/locale/ku/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/mt/torbutton.properties b/src/chrome/locale/mt/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/mt/torbutton.properties
+++ b/src/chrome/locale/mt/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 28c0566..2fac48d 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -1,13 +1,13 @@
 <!ENTITY torbutton.prefs.title "Innstillinger for Torbutton">
 <!ENTITY torbutton.prefs.display_settings "Innstillinger for visning">
-<!ENTITY torbutton.prefs.display_panel "Vis proxy-innstilling for Tor i statuslinjen">
+<!ENTITY torbutton.prefs.display_panel "Vis proxyinnstillinger for Tor i statuslinjen">
 <!ENTITY torbutton.prefs.panel_format "Visningsformat for statuslinjen:">
 <!ENTITY torbutton.prefs.panel_text_format "Tekst">
 <!ENTITY torbutton.prefs.panel_icon_format "Ikon">
 <!ENTITY torbutton.prefs.tor_settings "Proxyinnstillinger">
 <!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte proxyinnstillinger for min versjon av Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Bruk Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Bruk Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Bruk egne proxyinnstillinger">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL-proxy:">
@@ -19,7 +19,7 @@
 <!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for å endre på disse innstillingene.">
 <!ENTITY torbutton.pref_connection.more_info "Mer informasjon">
 <!ENTITY torbutton.pref_connection_more_info.title "Hjelp">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er for øyeblikket aktivert. Hvis du vil endre på ikke-Tor-proxyinnstillinger, venneligst deaktiver Torbutton og returner hit. Hvis du vil endre på Tor-innstillingene, venneligst bruk Torbutton-innstillingsvinduet.">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er for øyeblikket aktivert. Hvis du vil endre på ikke-Tor-proxyinnstillinger, vennligst deaktiver Torbutton og returner hit. Hvis du vil endre på Tor-innstillingene, vennligst bruk Torbutton-innstillingsvinduet.">
 <!ENTITY torbutton.context_menu.toggle "Endre Tor status">
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Innstillinger...">
@@ -29,71 +29,78 @@
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikk for å initialisere Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Sikkerhetsinnstillinger">
-<!ENTITY torbutton.prefs.block_thread "Blokker historie-lesning under Tor (avgjørende)">
-<!ENTITY torbutton.prefs.block_thwrite "Blokker historie-skrivning under Tor (anbefales)">
-<!ENTITY torbutton.prefs.block_nthread "Blokker historie-lesning under ikke-Tor (valgfritt)">
-<!ENTITY torbutton.prefs.block_nthwrite "Blokker historie-skrivning under ikke-Tor (valgfritt)">
+<!ENTITY torbutton.prefs.block_thread "Blokker historielesing under Tor (avgjørende)">
+<!ENTITY torbutton.prefs.block_thwrite "Blokker historieskriving under Tor (anbefales)">
+<!ENTITY torbutton.prefs.block_nthread "Blokker historielesing under ikke-Tor (valgfritt)">
+<!ENTITY torbutton.prefs.block_nthwrite "Blokker historie-skriving under ikke-Tor (valgfritt)">
 <!ENTITY torbutton.prefs.clear_history "Slett historie på Tor toggle (valgfritt)">
 <!ENTITY torbutton.prefs.clear_cache "Blokker Tor disk cache og slett all cache på Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Blokker adgang til disk- og minne-cache under Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Lagre ikke-Tor-infokapsler i en beskyttet jar">
-<!ENTITY torbutton.prefs.mmm_cookies "Jeg vil manuelt administrere mine infokapsler (farlig)">
-<!ENTITY torbutton.prefs.clear_cookies "Slett infokapsler på Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Deaktiver plugins under Tor (avgjørende)">
-<!ENTITY torbutton.prefs.kill_bad_js '"Hook" farlige javascript (avgjørende)'>
+<!ENTITY torbutton.prefs.block_cache "Blokker adgang til disk og minne-cache under Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Lagre ikke-Tor informasjonskapsler i en beskyttet jar">
+<!ENTITY torbutton.prefs.mmm_cookies "Jeg vil manuelt administrere mine informasjonskapsler (farlig)">
+<!ENTITY torbutton.prefs.clear_cookies "Slett informasjonskapsler på Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Deaktiver tillegg under Tor (avgjørende)">
+<!ENTITY torbutton.prefs.kill_bad_js "Fjern farlige javascript (avgjørende)">
 <!ENTITY torbutton.prefs.isolate_content "Isoler dynamisk innhold til Tor-tilstand (avgjørende)">
 <!ENTITY torbutton.prefs.no_updates "Deaktiver oppdateringer under Tor">
 <!ENTITY torbutton.prefs.set_uagent "Sett bruker-agent for bruk av Tor (avgjørende)">
 <!ENTITY torbutton.prefs.dynamic "Dynamisk Innhold">
-<!ENTITY torbutton.prefs.cookies "Infokapsler">
+<!ENTITY torbutton.prefs.cookies "Informasjonskapsler">
 <!ENTITY torbutton.prefs.cache "Hurtiglager">
 <!ENTITY torbutton.prefs.history "Historie">
 <!ENTITY torbutton.prefs.no_search "Deaktiver søkeforslag under Tor (anbefalt)">
 <!ENTITY torbutton.prefs.shutdown "Skru av">
-<!ENTITY torbutton.prefs.tor_shutdown "Slett Tor-infokapsler når nettleseren med Tor aktivert avsluttes">
-<!ENTITY torbutton.prefs.all_shutdown "Slett infokapsler hver gang nettleseren avsluttes">
-<!ENTITY torbutton.prefs.no_shutdown "Ikke slett infokapslene mine under avslutning">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headere">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US Engelsk nettleser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.tor_shutdown "Slett Tor-informasjonskapsler når nettleseren med Tor aktivert avsluttes">
+<!ENTITY torbutton.prefs.all_shutdown "Slett informasjonskapsler hver gang nettleseren avsluttes">
+<!ENTITY torbutton.prefs.no_shutdown "Ikke slett informasjonskapslene mine under avslutning">
+<!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver lagring av sesjoner (anbefalt)">
+<!ENTITY torbutton.prefs.headers "Topptekst">
+<!ENTITY torbutton.prefs.spoof_english "Parodier US Engelsk nettleser">
+<!ENTITY torbutton.prefs.disable_referer "Ikke sende referer-forespørsel under Tor (kan gjøre at enkelte sider ikke fungerer)">
 <!ENTITY torbutton.prefs.disable_domstorage "Deaktiver DOM-lagring under Tor (avgjørende)">
 <!ENTITY torbutton.prefs.forms "Skjemaer">
-<!ENTITY torbutton.prefs.block_tforms "Blokker lagring av passord + skjema-informasjons under Tor (anbefalt)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokker lagring av passord + skjema-informasjon under ikke-Tor (valgfritt)">
+<!ENTITY torbutton.prefs.block_tforms "Blokker lagring av passord + informasjon i skjema under Tor (anbefalt)">
+<!ENTITY torbutton.prefs.block_ntforms "Blokker lagring av passord + informasjon i skjema under ikke-Tor (valgfritt)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ikke-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Under oppstart av en gjenopprettet sesjon, sett Tor-status til:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Last jar-en med inforkapsler på nytt / slett infokapsler når Firefox kræsjer (anbefalt)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Lagre infokapsler for både Tor- og ikke-Tor i beskyttende jar (farlig)">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Last jar med informasjonskapsler på nytt / slett informasjonskapsler når Firefox kræsjer (anbefalt)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Lagre informasjonskapsler for både Tor og ikke-Tor i beskyttende jar (farlig)">
 <!ENTITY torbutton.prefs.clear_http_auth "Slett HTTP-autentiserte sesjoner (anbefalt)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isoler tilgang til historienavigering til Tor-status (kritisk)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Gjennopprett vinduer til størrelsen 50px under Tor (anbefalt)">
 <!ENTITY torbutton.prefs.close_tor "Lukk alle Tor-vinduer og faner på toggle (valgfritt)">
 <!ENTITY torbutton.prefs.close_nontor "Lukk alle ikke-tor-vinduer og faner på toggle (valgfritt)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.block_links "Blokker klikking av linker og oppdatering av sider fra forskjellige Tor-statuser (valgfritt)">
 <!ENTITY torbutton.prefs.jar_certs "Lagre SSL-sertifikater i forskjellige jars for Tor/ikke-Tor (anbefalt)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Lagre CA-sertifikater i forskjellige jars for Tor/ikke-Tor (anbefalt)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.locked_mode "Deaktiver Knappen og Hurtigtaster for å unngå uhell med toggle">
 <!ENTITY torbutton.prefs.startup_state "Under normal oppstart, sett Tor-status til:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.shutdown_state "Avslutningsmodus">
 <!ENTITY torbutton.prefs.startup "Oppstart">
 <!ENTITY torbutton.prefs.block_tor_file_net "Blokker Tor-tilgang til nettverket fra URL-er av typen file:// (anbefalt)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Blokker ikke-Tor-tilgang til nettverket fra URL-er av typen file://">
 <!ENTITY torbutton.prefs.restore_defaults "Gjenopprett standard">
 <!ENTITY torbutton.prefs.test_settings "Test innstillinger">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.test_auto "Test mine Tor-innstillinger etter første gang jeg aktiverer den hver gang Firefox starter opp">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ikke skriv Tor-infokapsler til disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ikke skriv ikke-Tor-infokapsler til disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.tor_memory_jar "Ikke skriv Tor-informasjonskapsler til disk">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Ikke skriv ikke-Tor informasjonskapsler til disk">
+<!ENTITY torbutton.prefs.session_restore "La sesjonen lagre og gjennopprette følgende faner:">
 <!ENTITY torbutton.prefs.nontor_tabs "Faner lastet under ikke-Tor">
 <!ENTITY torbutton.prefs.tor_tabs "Faner lastet under Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Ingen proxyer for:">
+<!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: Unngå å bruke noen av vertsnavnene ovenfor">
 <!ENTITY torbutton.prefs.disable_livemarks "Deaktiver oppdateringer av live-bokmerker under Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.dtd_recommended "(anbefalt)">
+<!ENTITY torbutton.prefs.dtd_optional "(valgfritt)">
+<!ENTITY torbutton.prefs.dtd_crucial "(kritisk)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index d06b675..5969b75 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -6,25 +6,31 @@ 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.{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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton legger til en knapp som gjør det enkelt å aktivere eller deaktivere Firefox sin tilgang til Tor-proxyen
+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 blokkerte direkte Tor-lasting av plugin-innhold.\n\nBruk lagre-som istedenfor.
-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.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 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.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.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 = 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
-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.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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+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 = 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/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 3327fd1..ca5f7a2 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy-instellingen">
 <!ENTITY torbutton.prefs.recommended_settings "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy gebruiken">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Polipo gebruiken">
 <!ENTITY torbutton.prefs.custom_settings "Aangepaste proxy-instellingen gebruiken">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL proxy:">
@@ -28,22 +28,22 @@
 <!ENTITY torbutton.context_menu.about.key "O">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.sec_settings "Beveiligingsinstellingen">
+<!ENTITY torbutton.prefs.block_thread "Blokkeer het lezen van de geschiedenis met Tor (cruciaal)">
+<!ENTITY torbutton.prefs.block_thwrite "Blokkeer het schrijven van de geschiedenis met Tor (aangeraden)">
+<!ENTITY torbutton.prefs.block_nthread "Blokkeer het lezen van de geschiedenis zonder Tor (optioneel)">
+<!ENTITY torbutton.prefs.block_nthwrite "Blokkeer het schrijven van de geschiedenis zonder Tor (optioneel)">
+<!ENTITY torbutton.prefs.clear_history "Verwijder de geschiedenis bij Tor-wissel (optioneel)">
+<!ENTITY torbutton.prefs.clear_cache "Blokkeer Tor schijf-cache en verwijder alle cachebestanden bij Tor-wissel">
+<!ENTITY torbutton.prefs.block_cache "Blokkeer Tor schijf- en geheugencache">
+<!ENTITY torbutton.prefs.cookie_jars "Sla de niet-Tor cookies op op een beveiligde plaats">
+<!ENTITY torbutton.prefs.mmm_cookies "Ik zal manueel de cookies beheren (gevaarlijk)">
+<!ENTITY torbutton.prefs.clear_cookies "Verwijder de cookies bij Tor-wissel">
+<!ENTITY torbutton.prefs.disable_plugins "Gebruik geen plug-ins bij Tor (cruciaal)">
+<!ENTITY torbutton.prefs.kill_bad_js "Pas gevaarlijke javascripts aan (cruciaal)">
+<!ENTITY torbutton.prefs.isolate_content "Isoleer dynamische inhoud binnen de Tor status (cruciaal)">
+<!ENTITY torbutton.prefs.no_updates "Doe geen updates bij Tor">
+<!ENTITY torbutton.prefs.set_uagent "Stel de user agent voor Torgebruik in (cruciaal)">
 <!ENTITY torbutton.prefs.dynamic "Dynamic Content">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index 7e9ded1..98fa7bd 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor uitgeschakeld
 torbutton.panel.label.enabled = Tor ingeschakeld
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/pa/torbutton.properties b/src/chrome/locale/pa/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/pa/torbutton.properties
+++ b/src/chrome/locale/pa/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 57d52e1..2bb03c8 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -94,6 +94,13 @@
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.prefs.disable_livemarks "WyÅ?Ä?cz uaktualnienia livemarks podczas używania Tora">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_recommended "(zalecane)">
+<!ENTITY torbutton.prefs.dtd_optional "(opcjonalne)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index 9a91d76..fc5af35 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Kliknij aby wyÅ?Ä?czyÄ? wtyczki
 torbutton.panel.label.disabled = Tor wyÅ?Ä?czony
 torbutton.panel.label.enabled = Tor wÅ?Ä?czony
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Rozszerzenie posiada przycisk do Å?atwego wÅ?Ä?czania/wyÅ?Ä?czania proxy Tor
-torbutton.popup.history.warning = Torbutton zablokowaÅ? manipulowanie historiÄ?, aby zaÅ?ataÄ? niebezpiecznÄ? lukÄ? w Firefoxie.\n\nNaciÅ?nij 'Enter' w polu adresu lub otwórz nowÄ? zakÅ?adkÄ? lub okno.\n\n
+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 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Ä??
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (wymagane)
 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
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.launch = Uruchom aplikacjÄ?
+torbutton.popup.cancel = Anuluj
 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/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index c8f8e8d..2b02482 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -63,7 +63,7 @@
 <!ENTITY torbutton.prefs.block_ntforms "Bloquear senhas + informações de formulários quando não usar o TOR (opcional)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Não-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.restore_tor "Quando restaurar sessão, definir estado do Tor para:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar cookie/limpar cookies em uma falha do Firefox (recomendado)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Armazene os cookies, sejam ou não de Tor, em recipientes protegidos (Perigoso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Limpar as sessões HTTP autenticadas (recomendado)">
@@ -74,26 +74,33 @@
 <!ENTITY torbutton.prefs.block_links "Bloquear os link clicks e as recarga de páginas desde diferentes arquivos de estado de Tor (opcional)">
 <!ENTITY torbutton.prefs.jar_certs "Armazene certificados SSL em arquivos de estado de Tor separados para páginas Tor e não-Tor (recomendado)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Armazene certificados CA em arquivos de estado separados para páginas Tor e não-Tor (recomendado)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
+<!ENTITY torbutton.prefs.locked_mode "Desabilitar botões e atalhos para prevenir mudanças acidentais">
+<!ENTITY torbutton.prefs.startup_state "Durante inicio normal, definir estado do Tor para:">
+<!ENTITY torbutton.prefs.shutdown_state "Modo de desligamento">
+<!ENTITY torbutton.prefs.startup "Inicio">
+<!ENTITY torbutton.prefs.block_tor_file_net "Bloquear o acesso à rede a partir de urls do tipo file:// (recomendado)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Bloquear acesso não-Tor à rede a partir de urls do tipo file://">
+<!ENTITY torbutton.prefs.restore_defaults "Restaurar padrão">
 <!ENTITY torbutton.prefs.test_settings "Testar configurações">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.test_auto "Testar minhas configurações do Tor, quando houver alteração, durante o carregamento do Firefox">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Não gravar cookies do Tor no disco">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Não gravar cookies não-Tor no disco">
+<!ENTITY torbutton.prefs.session_restore "Salvar sessão e restaurar essas abas:">
+<!ENTITY torbutton.prefs.nontor_tabs "Abas não-Tor carregadas">
+<!ENTITY torbutton.prefs.tor_tabs "Abas carregadas no Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Sem Proxy para: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite usar quaisquer dos hosts acima">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
+<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index b0e6e14..01a26a3 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Clique para desabilitar plugins
 torbutton.panel.label.disabled = Tor desabilitado
 torbutton.panel.label.enabled = Tor habilitado
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provê um ícone para habilitar ou desabilitar rapidamente o proxy Tor
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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 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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 torbutton.popup.launch = Rode a aplicação
 torbutton.popup.cancel = Cancelado
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Teste do Tor proxy: HTTP Proxy local está inacessível. Polipo está rodando devidamente?
+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/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index bfd307d..5e7d783 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -94,6 +94,13 @@
 <!ENTITY torbutton.prefs.no_proxies_on "Nenhum proxy para: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Evite utilizar o nome da máquina no campo a cima">
 <!ENTITY torbutton.prefs.disable_livemarks "Desactivar actualizações durante a utilização do Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
+<!ENTITY torbutton.prefs.dtd_optional "(opcional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index e53ec9d..c78dd5b 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Clique para desactivar plugins
 torbutton.panel.label.disabled = Tor desactivado
 torbutton.panel.label.enabled = Tor activado
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton fornece um ícone para activar ou desactivar rapidamente o proxy Tor
-torbutton.popup.history.warning = O Torbutton bloqueou a alteração de histórico desta página. Isto é uma resolução de um problema de segurança conhecido.\n\nPressione 'enter' na barra de endereços ou abra uma nova aba.\n\n
+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 bloqueou o carregamento do plugin de conteúdo do Tor.\n\nUtilize o Salvar Como.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certificado de Autenticação. Verificar a lista de Certificados de Autenticação pode ser uma operação lenta para o Tor. Gostaria de desactivar o modo de isolamento de Certificados de Autenticação? (Se você não percebeu esta mensagem, o mais seguro é pressionar OK)
 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?
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Carregar conteúdo externo?
 torbutton.popup.external.app = Uma aplicação externa é necessário para abrir:\n\n
 torbutton.popup.external.note = \n\nNota: Aplicações externas ao Tor N�O são seguras, e podem dar a conhecer a sua origem!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 torbutton.popup.launch = Correr aplicação
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = Sempre correr aplicações daqui para a frente
 torbutton.popup.test.no_http_proxy = Teste ao proxy Tor: Erro na ligação ao proxy HTTP local. O Polipo está em execução?
+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/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index dd2ff42..77a5c73 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -1,34 +1,34 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
+<!ENTITY torbutton.prefs.title "PreferinÈ?e Torbutton">
+<!ENTITY torbutton.prefs.display_settings "SetÄ?ri de vizualizare">
+<!ENTITY torbutton.prefs.display_panel "AratÄ? setÄ?rile proxy pentru Tor în bara de statut">
 <!ENTITY torbutton.prefs.panel_format "Status bar display format:">
 <!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.prefs.panel_icon_format "IconiÈ?Ä?">
+<!ENTITY torbutton.prefs.tor_settings "SetÄ?rile pentru proxy">
+<!ENTITY torbutton.prefs.recommended_settings "FoloseÈ?te setÄ?rile pentru proxy recomandate pentru versiunea mea de Firefox">
+<!ENTITY torbutton.prefs.use_privoxy "FoloseÈ?te Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "FoloseÈ?te Polipo">
+<!ENTITY torbutton.prefs.custom_settings "FoloseÈ?te setÄ?ri individualizate pentru proxy">
+<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
+<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
+<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
+<!ENTITY torbutton.prefs.proxy.port "Portul:">
+<!ENTITY torbutton.about.title "Despre Torbutton">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "Informatii suplimentare">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajutor">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.toggle "Comutarea starii Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferinte">
+<!ENTITY torbutton.context_menu.preferences "PreferinÈ?e">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Despre Butonul Tor">
+<!ENTITY torbutton.context_menu.about "Despre Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Butonul Tor">
-<!ENTITY torbutton.button.tooltip "Click pentru initializarea Butonului Tor">
-<!ENTITY torbutton.prefs.sec_settings "Setari de securitate">
+<!ENTITY torbutton.button.tooltip "ApasÄ? pentru pornirea Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "SetÄ?ri de securitate">
 <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
 <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
@@ -47,7 +47,7 @@
 <!ENTITY torbutton.prefs.dynamic "Conţinut dinamic ">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Cronologie (istorie)">
+<!ENTITY torbutton.prefs.history "Istoric">
 <!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown "Inchide">
 <!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
@@ -94,6 +94,13 @@
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_recommended "(recomandat)">
+<!ENTITY torbutton.prefs.dtd_optional "(opÈ?ional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties
index c51d069..75b51f6 100644
--- a/src/chrome/locale/ro/torbutton.properties
+++ b/src/chrome/locale/ro/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (critic)
 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 9404272..6f74410 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и">
 <!ENTITY torbutton.prefs.recommended_settings "Ð?Ñ?полÑ?зоваÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и, Ñ?екомендованнÑ?е длÑ? данной веÑ?Ñ?ии Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Ð?Ñ?полÑ?зоваÑ?Ñ? Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Ð?Ñ?полÑ?зоваÑ?Ñ? Polipo">
 <!ENTITY torbutton.prefs.custom_settings "УÑ?Ñ?ановиÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и вÑ?Ñ?Ñ?нÑ?Ñ?">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-пÑ?окÑ?и:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL-пÑ?окÑ?и:">
@@ -62,7 +62,7 @@
 <!ENTITY torbutton.prefs.block_tforms "Ð?локиÑ?оваÑ?Ñ? Ñ?оÑ?Ñ?анение паÑ?олей и даннÑ?Ñ? Ñ?оÑ?м пÑ?и иÑ?полÑ?зовании Tor (желаÑ?елÑ?но)">
 <!ENTITY torbutton.prefs.block_ntforms "Ð?локиÑ?оваÑ?Ñ? Ñ?оÑ?Ñ?анение паÑ?олей и даннÑ?Ñ? Ñ?оÑ?м пÑ?и оÑ?клÑ?Ñ?енном Tor (необÑ?з.)">
 <!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "не-Tor">
+<!ENTITY torbutton.prefs.non_tor "Ð?е-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ð?о вÑ?емÑ? запÑ?Ñ?ка, еÑ?ли воÑ?Ñ?Ñ?анавливаеÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?, Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние Tor в:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ð?оÑ?Ñ?Ñ?анавливаÑ?Ñ?/оÑ?иÑ?аÑ?Ñ? cookies поÑ?ле аваÑ?ии Firefox (желаÑ?елÑ?но)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Ð¥Ñ?аниÑ?Ñ? вÑ?е cookies в заÑ?иÑ?еннÑ?Ñ? Ñ?айлаÑ? (опаÑ?но)">
@@ -93,7 +93,14 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ð?еÑ? пÑ?окÑ?и длÑ?">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ð?нимание: Ð?е вноÑ?иÑ?е никакиÑ? имен доменов в поле вÑ?Ñ?е">
-<!ENTITY torbutton.prefs.disable_livemarks "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? обновление livemarks во вÑ?емÑ? Ñ?абоÑ?Ñ? в Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.disable_livemarks "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? обновление Livemarks во вÑ?емÑ? Ñ?абоÑ?Ñ? в Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(Ñ?екомендÑ?еÑ?Ñ?Ñ?)">
+<!ENTITY torbutton.prefs.dtd_optional "(по желаниÑ?)">
+<!ENTITY torbutton.prefs.dtd_crucial "(кÑ?иÑ?иÑ?но)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index bdac9fc..986e6d3 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -7,24 +7,30 @@ torbutton.panel.plugins.enabled = Ð?ажмиÑ?е, Ñ?Ñ?обÑ? оÑ?клÑ?Ñ?иÑ?Ñ?
 torbutton.panel.label.disabled = Tor оÑ?клÑ?Ñ?ен
 torbutton.panel.label.enabled = Tor вклÑ?Ñ?ен
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ð?нопка вклÑ?Ñ?ениÑ?/оÑ?клÑ?Ñ?ениÑ? доÑ?Ñ?Ñ?па к Ð?нÑ?еÑ?неÑ? Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor
-torbutton.popup.history.warning = Torbutton блокиÑ?Ñ?еÑ? Ñ?абоÑ?Ñ? Ñ? иÑ?Ñ?оÑ?ией бÑ?оÑ?зеÑ?а. ЭÑ?о позволÑ?еÑ? Ñ?Ñ?Ñ?Ñ?аниÑ?Ñ? оÑ?ибкÑ? в безопаÑ?ноÑ?Ñ?и Firefox.\n\nÐ?ажмиÑ?е 'enter' в адÑ?еÑ?ной Ñ?Ñ?Ñ?оке либо оÑ?кÑ?ойÑ?е новÑ?Ñ? вкладкÑ? или окно.\n\n
+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 заблокиÑ?овал пÑ?Ñ?мÑ?Ñ? Ñ?Ñ?Ñ?ановкÑ?  плагинов Ñ?еÑ?ез Tor.\n\nÐ?Ñ?полÑ?зÑ?йÑ?е Ñ?поÑ?об СоÑ?Ñ?аниÑ?Ñ? как.\n\n
 torbutton.popup.confirm_ca_certs = Ð?Ñ?имеÑ?аение: Ð?Ñ?евидно Ñ? ваÑ? неÑ? индивидÑ?алÑ?нÑ?Ñ? СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии. Ð?Ñ?овеÑ?ка Ñ?пиÑ?ка СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии медленнаÑ? опеÑ?аÑ?иÑ? и замедлÑ?еÑ? пеÑ?еклÑ?Ñ?ение Tor. ХоÑ?иÑ?е оÑ?клÑ?Ñ?иÑ?Ñ? изолÑ?Ñ?иÑ? СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии? (Ð?Ñ?ли Ð?Ñ? не понимаеÑ?е о Ñ?ем Ñ?еÑ?Ñ?, безопаÑ?ней нажаÑ?Ñ? OK)
 torbutton.popup.ff3.warning = Ð?нимание!\n\nTorbutton в Firefox 3 как извеÑ?Ñ?но оÑ?кÑ?Ñ?ваеÑ? возможноÑ?Ñ?Ñ? Ñ?Ñ?еÑ?ки даннÑ?Ñ? о ваÑ?ей вÑ?еменной зоне и livemarks поÑ?Ñ?едÑ?Ñ?вом Tor.\n\nÐ?Ñ?е еÑ?Ñ? Ñ?оÑ?иÑ?е пÑ?одолжиÑ?Ñ? ?
 torbutton.popup.toggle.warning = Ð?лÑ? Ñ?ого Ñ?Ñ?обÑ? изменениÑ? вÑ?Ñ?Ñ?пили в Ñ?илÑ?. Ð?ам необÑ?одимо вÑ?клÑ?Ñ?иÑ?Ñ? и пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Tor.
 torbutton.popup.test.success = Tor proxy Ñ?еÑ?Ñ? Ñ?Ñ?пеÑ?но пÑ?ойден!
-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 = Ð?ажмиÑ?е OK длÑ? пÑ?овеÑ?ки наÑ?Ñ?Ñ?оек Tor. ЭÑ?оÑ? Ñ?еÑ?Ñ? вÑ?полнÑ?еÑ?Ñ?Ñ? в Ñ?оне. Ð?ожалÑ?йÑ?Ñ?а бÑ?дÑ?Ñ?е Ñ?еÑ?пеливÑ?.Ð?ождиÑ?еÑ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ?ов.
+torbutton.popup.test.failure = Tor proxy Ñ?еÑ?Ñ? завеÑ?Ñ?илÑ?Ñ? Ð?Ð?УÐ?Ð?ЧÐ?Ð?! Ð?Ñ?овеÑ?Ñ?Ñ?е ваÑ? proxy и конÑ?игÑ?Ñ?аÑ?иÑ? Privoxy.
+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 = Load external content?
+torbutton.popup.external.title = Ð?агÑ?Ñ?зиÑ?Ñ? внеÑ?ние даннÑ?е?
 torbutton.popup.external.app = Ð?неÑ?нÑ?Ñ? пÑ?икладнаÑ? пÑ?огÑ?амма необÑ?одима длÑ? обÑ?абоÑ?ки:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.note = \n\nÐ?Ð Ð?Ð?Ð?ЧÐ?Ð?Ð?Ð?: Ð?неÑ?ние пÑ?икладнÑ?е пÑ?огÑ?аммÑ? Ð?Ð? ЯÐ?Ð?ЯЮТСЯ безопаÑ?нÑ? длÑ? Tor по Ñ?молÑ?аниÑ? и могÑ?Ñ? Ñ?азоблаÑ?иÑ?Ñ? ваÑ?!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 torbutton.popup.launch = Ð?апÑ?Ñ?Ñ?иÑ?Ñ? пÑ?иложение
 torbutton.popup.cancel = Ð?Ñ?мениÑ?Ñ?
 torbutton.popup.dontask = Ð?Ñ?нане вÑ?егда запÑ?Ñ?каÑ?Ñ? пÑ?иложениÑ?
 torbutton.popup.test.no_http_proxy = Tor пÑ?окÑ?и-Ñ?еÑ?Ñ?: Ð?еÑ?Ñ?нÑ?е HTTP-пÑ?окÑ?и недоÑ?Ñ?Ñ?пнÑ?. РабоÑ?аеÑ?-ли Polipo  должнÑ?м обÑ?азом?
+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/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index eeaa841..40215ff 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -28,72 +28,79 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razširitve Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.sec_settings "Varnostne Nastavitve">
+<!ENTITY torbutton.prefs.block_thread "Prepovej branje zgodovine med uporabo Tor-a (obvezno)">
+<!ENTITY torbutton.prefs.block_thwrite "Prepovej zapisovanje zgodovine med uporabo Tor-a (priporoÄ?eno)">
+<!ENTITY torbutton.prefs.block_nthread "Prepovej branje zgodovine, ko Tor ni v uporabi (neobvezno)">
+<!ENTITY torbutton.prefs.block_nthwrite "Prepovej zapisovanje zgodovine, ko Tor ni v uporabi (neobvezno)">
+<!ENTITY torbutton.prefs.clear_history "PoÄ?isti zgodovino med preklopom Tor-a (neobvezno)">
+<!ENTITY torbutton.prefs.clear_cache "Prepovej zapisovanje medpomnilnika na disk ter brisanje medpomnilnika ob preklopu Tor-a">
+<!ENTITY torbutton.prefs.block_cache "Prepovej zapisovanje (na disk in zaÄ?asni spomin) medpomnilnika med uporabo Tor-a">
+<!ENTITY torbutton.prefs.cookie_jars "Shrani ne-Tor piÅ¡kotke v zaÅ¡Ä?iten predal">
+<!ENTITY torbutton.prefs.mmm_cookies "Samodejno bom upravljal z piškotki (nevarno)">
+<!ENTITY torbutton.prefs.clear_cookies "Zbriši piškotke ob preklopu Tor-a">
+<!ENTITY torbutton.prefs.disable_plugins "OnemogoÄ?i dodatke med uporabo Tor-a (obvezno)">
+<!ENTITY torbutton.prefs.kill_bad_js "Ustavi nevarne javascript-e (obvezno)">
+<!ENTITY torbutton.prefs.isolate_content "IzloÄ?i dinamiÄ?ne vsebine za stanje Tor-a (obvezno)">
+<!ENTITY torbutton.prefs.no_updates "OnemogoÄ?i nadgradnje med uporabo Tor-a">
+<!ENTITY torbutton.prefs.set_uagent "Nastavi brskalnik za uporabo Tor-a (obvezno)">
+<!ENTITY torbutton.prefs.dynamic "DinamiÄ?ne vsebine">
+<!ENTITY torbutton.prefs.cookies "Piškotki">
+<!ENTITY torbutton.prefs.cache "Medpomnilnik">
+<!ENTITY torbutton.prefs.history "Zgodovina">
+<!ENTITY torbutton.prefs.no_search "OnemogoÄ?i predlagana Iskanja med uporabo Tor-a (priporoÄ?eno)">
+<!ENTITY torbutton.prefs.shutdown "Ugasni">
+<!ENTITY torbutton.prefs.tor_shutdown "Zbriši Tor piškotke pri ugašanju Tor-aktivnega brskalnika">
+<!ENTITY torbutton.prefs.all_shutdown "Zbriši piškotke pri ugašanju brskalnika">
+<!ENTITY torbutton.prefs.no_shutdown "Ne zbriši piškotkov pri ugašanju">
+<!ENTITY torbutton.prefs.disable_sessionstore "OnemogoÄ?i shranjevanje sej (proporoÄ?eno)">
+<!ENTITY torbutton.prefs.headers "Headers (informacije na zaÄ?etku paketa - naslavljanje)">
+<!ENTITY torbutton.prefs.spoof_english 'Navidezno "US English" brskalnik'>
+<!ENTITY torbutton.prefs.disable_referer 'Ne poÅ¡iljaj "referer" med uporabo Tor-a (lahko prekine doloÄ?ene strani)'>
+<!ENTITY torbutton.prefs.disable_domstorage "OnemogoÄ?i DOM shranjevanje med uporabo Tor-a (obvezno)">
+<!ENTITY torbutton.prefs.forms "Obrazci">
+<!ENTITY torbutton.prefs.block_tforms "Prepovej shranjevanje vnosov v obrazce in gesel med uporabo Tor-a (priporoÄ?eno)">
+<!ENTITY torbutton.prefs.block_ntforms "Prepovej shranjevanje vnosov v obrazce in gesel, ko Tor ni v uporabi (neobvezno)">
 <!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.non_tor "Ne-Tor">
+<!ENTITY torbutton.prefs.restore_tor "Ob zaÄ?etku obnovljene seje nastavi Tor na:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Naloži piÅ¡kotke iz predala /poÄ?isti piÅ¡kotke, Ä?e se Firefox samodejno zapre (proporoÄ?eno)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Shrani Tor in ne-tor piÅ¡kotke v zaÅ¡Ä?iten predal (nevarno)">
+<!ENTITY torbutton.prefs.clear_http_auth "PoÄ?isti HTTP seje (priporoÄ?eno)">
+<!ENTITY torbutton.prefs.block_js_history "IzloÄ?i dostop do pregleda zgodovine v Tor stanje (obvezno)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Spremeni velikost oken na veÄ? 50px oken med uporabo Tor-a (priporoÄ?eno)">
+<!ENTITY torbutton.prefs.close_tor "Zapri vsa Tor okna in zavihke ob preklopu (neobvezno)">
+<!ENTITY torbutton.prefs.close_nontor "Zapri vsa ne-Tor okna in zavihke ob preklopu (neobvezno)">
+<!ENTITY torbutton.prefs.block_links "Prepovej klike povezav in osveževanje strani od razliÄ?nih stanj Tor-a (neobvezno)">
+<!ENTITY torbutton.prefs.jar_certs "Shrani SSL cert. v posebne predale za Tor / ne-Tor  (priporoÄ?eno)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Shrani CA cert. v posebne predale za Tor / ne-Tor  (priporoÄ?eno)">
+<!ENTITY torbutton.prefs.locked_mode "OnemogoÄ?i gumbe in bližnice da prepreÄ?iÅ¡ nenamerne preklope">
+<!ENTITY torbutton.prefs.startup_state "Ob navadnem zagonu nastavi stanje Tor-a na:">
+<!ENTITY torbutton.prefs.shutdown_state "Stanje izklopa">
+<!ENTITY torbutton.prefs.startup "Vklop">
+<!ENTITY torbutton.prefs.block_tor_file_net "Prepovej Tor dostop do omrežja iz datoteke:// urls (priporoÄ?eno)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Prepovej ne-Tor dostop do omrežja iz datoteke:// urls">
+<!ENTITY torbutton.prefs.restore_defaults "Privzete nastavitve">
+<!ENTITY torbutton.prefs.test_settings "Preveri nastavitve">
+<!ENTITY torbutton.prefs.test_auto "Preveri moje Tor nastavitve po prvem preklopu, ob vsakem zagonu Firefoxa">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Ne zapisuj Tor piškotkov na disk">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Ne zapisuj ne-Tor piškotkov na disk">
+<!ENTITY torbutton.prefs.session_restore "Seja naj shrani in obnovi naslednje zavihke:">
+<!ENTITY torbutton.prefs.nontor_tabs "Zavihki naloženi v ne-Tor-u">
+<!ENTITY torbutton.prefs.tor_tabs "Zavihki naloženi v Tor-u">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.no_proxies_on "Ne uporabi Proxi za: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Opozorilo: izogibaj se uporabi zgornjih oznak (hostname)">
+<!ENTITY torbutton.prefs.disable_livemarks "OnemogoÄ?i RSS posodobitve med uporaboTor-a ">
+<!ENTITY torbutton.prefs.dtd_recommended "(priporoÄ?eno)">
+<!ENTITY torbutton.prefs.dtd_optional "(neobvezno)">
+<!ENTITY torbutton.prefs.dtd_crucial "(obvezno)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/sl/torbutton.properties b/src/chrome/locale/sl/torbutton.properties
index 0e2d37d..54991c1 100644
--- a/src/chrome/locale/sl/torbutton.properties
+++ b/src/chrome/locale/sl/torbutton.properties
@@ -2,29 +2,35 @@ 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 = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+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.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton razÅ¡iritev omogoÄ?a enostavno vkljuÄ?itev ali izkljuÄ?itev povezave preko anonimizacijskega omrežja Tor
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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.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 = 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.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 = 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.ff3_notice = pritisni OK da preveriš Tor proxy nastavitve. Test se bo izvajal v ozadju. Bodite potrpežljivi
+torbutton.panel.label.verified = Tor preverjen
 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.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
-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.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+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 = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/sq/torbutton.properties b/src/chrome/locale/sq/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/sq/torbutton.properties
+++ b/src/chrome/locale/sq/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 715bf29..5c42da4 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -45,11 +45,11 @@
 <!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
 <!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
 <!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cookies "Kakor">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.history "Historia">
+<!ENTITY torbutton.prefs.no_search "Stäng av sökmotorers förslag under användning av Tor (rekommenderas)">
+<!ENTITY torbutton.prefs.shutdown "Stäng av">
 <!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
 <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/sw/torbutton.properties b/src/chrome/locale/sw/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/sw/torbutton.properties
+++ b/src/chrome/locale/sw/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index f790890..7bd6e8e 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/th/torbutton.properties b/src/chrome/locale/th/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/th/torbutton.properties
+++ b/src/chrome/locale/th/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index 0ab4f18..4f268c0 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Eklentiler DevredıÅ?ı
 torbutton.panel.label.disabled = Tor DevredıÅ?ı
 torbutton.panel.label.enabled = Tor Etkin
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = TortuÅ?u firefoxte kolaylıkla Tor proxy etkin veya devredıÅ?ı bırakmanızı saÄ?lar.
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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 Torun eklenti içeriÄ?ini yüklemesini blokladı.\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?
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (çok önemlil)
 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index d154c21..7376a36 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/uk/torbutton.properties b/src/chrome/locale/uk/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/uk/torbutton.properties
+++ b/src/chrome/locale/uk/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 6ee1972..850d136 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Thiết lập Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Dùng thiết lập proxy Ä?ã khuyến nghá»? cho Firefox của tôi">
 <!ENTITY torbutton.prefs.use_privoxy "Dùng Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Dùng Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Dùng thiết lập proxy tùy biến">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
@@ -91,9 +91,16 @@
 <!ENTITY torbutton.prefs.tor_tabs "Thẻ Ä?ược má»? trong Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Không có Ủy nhi�m cho:">
+<!ENTITY torbutton.prefs.no_proxy_warning "Cảnh báo: Tránh sử dụng bất kỳ tên máy chủ � trên">
 <!ENTITY torbutton.prefs.disable_livemarks "Vô hiá»?u hóa viá»?c cập nhật Ä?ánh-dấu-Ä?á»?ng trong quá trình dùng Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index 3bbb32c..349df50 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -7,24 +7,30 @@ 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.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton cung cấp má»?t nút Ä?á»? dá»? dà ng bật hoặc tắt viá»?c chuyá»?n hÆ°á»?ng Firefox Ä?ến proxy Tor
-torbutton.popup.history.warning = Torbutton chặn viá»?c thay Ä?á»?i tình trạng lược sá»­. Cách nà y là  Ä?á»? sá»­a lại má»?t lá»?i bảo mật của Firefox.\n\nNhấn 'enter' trong há»?p Ä?á»?a chá»?, hoặc má»? má»?t cá»­a sá»? má»?i hay thẻ má»?i.\n\n
+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 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 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.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 = 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
-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.external.title = Nạp n�i dung bên ngoà i?
+torbutton.popup.external.app = Má»?t ứng dụng bên ngoà i cần có Ä?á»? xá»­ lý:\n\n
+torbutton.popup.external.note = \n\nLƯU Ã?: Các ứng dụng bên ngoà i không an toà n cho Tor theo mặc Ä?á»?nh và  có thá»? là m lộ chân tÆ°Æ¡Í?ng bạn!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.launch = Kh�i chạy ứng dụng
+torbutton.popup.cancel = Hủy b�
+torbutton.popup.dontask = Luôn luôn kh�i chạy các ứng dụng k� từ bây gi�
+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 = 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/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index a76874b..7339a70 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -93,7 +93,14 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "ä¸?使ç?¨ä»£ç??ç??å?°å??:">
 <!ENTITY torbutton.prefs.no_proxy_warning "è­¦å??ï¼?请ä¸?è¦?使ç?¨ä¸?è¿°ä»»ä½?主æ?ºå??ã??">
-<!ENTITY torbutton.prefs.disable_livemarks "使� Tor ��� Livemark(RSS书签) ��">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.disable_livemarks "使�Tor���Livemark��(RSS书签)">
+<!ENTITY torbutton.prefs.dtd_recommended "(æ?¨è??)">
+<!ENTITY torbutton.prefs.dtd_optional "(å?¯é??)">
+<!ENTITY torbutton.prefs.dtd_crucial "(é??è¦?)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 34ee24d..085139f 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = ç?¹å?»ç¦?ç?¨æ??件
 torbutton.panel.label.disabled = Tor 已��
 torbutton.panel.label.enabled = Tor 已��
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = é??è¿? Torbutton æ??é?®å?¯ä»¥æ?¹ä¾¿å?°è®© Firefoxå??ç?¨æ??使ç?¨ Tor ä½?为代ç??ã??
-torbutton.popup.history.warning = 为äº?解å?³ Firefox ç??å®?å?¨æ¼?æ´?ï¼?Torbutton é?»æ­¢äº?模å¼?æ?¹å??å??ï¼?å?¨å·²æµ?è§?ç½?页é?´ç??跳转æ??ä½?ã??\n\n请å?¨å?°å??æ ?中æ??å??车æ??æ??å¼?æ?°çª?å?£æ??æ?°æ ?签页è¿?è¡?æµ?è§?ã??\n\n
+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 é?»æ­¢äº?æµ?è§?å?¨æ?´ 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é?¾æ?¥ï¼?ï¼?Torbutton 对此æ? è?½ä¸ºå??ã??\n\næ?¨æ?¯å?¦è¦?继续ï¼?
@@ -24,7 +24,13 @@ torbutton.prefs.crucial = (é??è¦?)
 torbutton.popup.external.title = è½½å?¥å¤?é?¨å??容ï¼?
 torbutton.popup.external.app = é??è¦?å¤?é?¨ç¨?åº?æ?¥å¤?ç??:\n\n
 torbutton.popup.external.note = \n\n注æ??ï¼?å¤?é?¨ç¨?åº?使ç?¨Tor并ä¸?å®?å?¨å?¯è?½æ³?é?²æ?¨ç??身份ï¼?\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 torbutton.popup.launch = ����
 torbutton.popup.cancel = å??æ¶?
 torbutton.popup.dontask = æ­¤å??æ?»æ?¯å?¯å?¨ç¨?åº?
 torbutton.popup.test.no_http_proxy = Tor代ç??æµ?è¯?ï¼?æ?¬å?°HTTP代ç??ä¸?å?¯è¾¾ï¼?æ?¨ç??Polipo正常å?¯å?¨äº?å??ï¼?
+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/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index 7183cca..20d547a 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/zh-HK/torbutton.properties b/src/chrome/locale/zh-HK/torbutton.properties
index ef6c42a..e2e8754 100644
--- a/src/chrome/locale/zh-HK/torbutton.properties
+++ b/src/chrome/locale/zh-HK/torbutton.properties
@@ -7,7 +7,7 @@ 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 changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 5893363..004e219 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -97,3 +97,10 @@
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha">
+<!ENTITY torbutton.prefs.search_engine "Search engine:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index eeef493..ba52c6d 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor å·²å??ç?¨
 torbutton.panel.label.enabled = Tor å·²å??ç?¨
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton æ??ä¾?ä¸?å??å??æ??å??ç?¨/å??ç?¨ Proxy ç??æ??é??
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+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?
@@ -24,7 +24,13 @@ 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
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
 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
-- 
1.7.1