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

Thu Sep 30 16:20:15 UTC 2010

Author: Mike Perry <mikeperry-git at fscked.org>
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


