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

[tor-commits] [torbutton/master] New strings from transifex.



commit 8354d3a5aa096effec63df4544d4e4da382817fe
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Thu May 31 15:17:13 2012 -0700

    New strings from transifex.
---
 src/chrome/locale/af/torbutton.dtd           |    2 +-
 src/chrome/locale/af/torbutton.properties    |    3 +
 src/chrome/locale/ak/torbutton.dtd           |    2 +-
 src/chrome/locale/ak/torbutton.properties    |    3 +
 src/chrome/locale/am/torbutton.dtd           |    2 +-
 src/chrome/locale/am/torbutton.properties    |    3 +
 src/chrome/locale/ar/torbutton.properties    |    3 +
 src/chrome/locale/arn/torbutton.dtd          |    2 +-
 src/chrome/locale/arn/torbutton.properties   |    3 +
 src/chrome/locale/ast/torbutton.dtd          |    2 +-
 src/chrome/locale/ast/torbutton.properties   |    3 +
 src/chrome/locale/az/torbutton.dtd           |    2 +-
 src/chrome/locale/az/torbutton.properties    |    3 +
 src/chrome/locale/be/torbutton.dtd           |    2 +-
 src/chrome/locale/be/torbutton.properties    |    3 +
 src/chrome/locale/bg/torbutton.dtd           |    2 +-
 src/chrome/locale/bg/torbutton.properties    |    3 +
 src/chrome/locale/bn-IN/torbutton.dtd        |    2 +-
 src/chrome/locale/bn-IN/torbutton.properties |    3 +
 src/chrome/locale/bn/torbutton.dtd           |    2 +-
 src/chrome/locale/bn/torbutton.properties    |    3 +
 src/chrome/locale/bo/torbutton.dtd           |    2 +-
 src/chrome/locale/bo/torbutton.properties    |    3 +
 src/chrome/locale/br/torbutton.dtd           |    2 +-
 src/chrome/locale/br/torbutton.properties    |    3 +
 src/chrome/locale/bs/torbutton.dtd           |    2 +-
 src/chrome/locale/bs/torbutton.properties    |    3 +
 src/chrome/locale/ca/torbutton.dtd           |    2 +-
 src/chrome/locale/ca/torbutton.properties    |   17 +-
 src/chrome/locale/cs/torbutton.dtd           |   24 ++--
 src/chrome/locale/cs/torbutton.properties    |   65 ++++---
 src/chrome/locale/csb/torbutton.dtd          |    2 +-
 src/chrome/locale/csb/torbutton.properties   |    3 +
 src/chrome/locale/cy/torbutton.dtd           |    2 +-
 src/chrome/locale/cy/torbutton.properties    |    3 +
 src/chrome/locale/da/torbutton.dtd           |    8 +-
 src/chrome/locale/da/torbutton.properties    |   45 +++--
 src/chrome/locale/de/torbutton.properties    |   15 +-
 src/chrome/locale/dz/torbutton.dtd           |    2 +-
 src/chrome/locale/dz/torbutton.properties    |    3 +
 src/chrome/locale/el/torbutton.dtd           |   60 +++---
 src/chrome/locale/el/torbutton.properties    |   25 ++-
 src/chrome/locale/eo/torbutton.dtd           |   34 ++--
 src/chrome/locale/eo/torbutton.properties    |    3 +
 src/chrome/locale/es/torbutton.properties    |    3 +
 src/chrome/locale/et/torbutton.dtd           |    2 +-
 src/chrome/locale/et/torbutton.properties    |    3 +
 src/chrome/locale/eu/torbutton.dtd           |  124 ++++++------
 src/chrome/locale/eu/torbutton.properties    |   33 ++--
 src/chrome/locale/fa/torbutton.properties    |    3 +
 src/chrome/locale/fi/torbutton.properties    |   31 ++--
 src/chrome/locale/fil/torbutton.dtd          |    2 +-
 src/chrome/locale/fil/torbutton.properties   |    3 +
 src/chrome/locale/fo/torbutton.dtd           |    2 +-
 src/chrome/locale/fo/torbutton.properties    |    3 +
 src/chrome/locale/fr/torbutton.properties    |    3 +
 src/chrome/locale/fur/torbutton.dtd          |    2 +-
 src/chrome/locale/fur/torbutton.properties   |    3 +
 src/chrome/locale/fy/torbutton.dtd           |    2 +-
 src/chrome/locale/fy/torbutton.properties    |    3 +
 src/chrome/locale/ga/torbutton.dtd           |    2 +-
 src/chrome/locale/ga/torbutton.properties    |    3 +
 src/chrome/locale/gl/torbutton.dtd           |    2 +-
 src/chrome/locale/gl/torbutton.properties    |    3 +
 src/chrome/locale/gu/torbutton.properties    |    3 +
 src/chrome/locale/gun/torbutton.dtd          |    2 +-
 src/chrome/locale/gun/torbutton.properties   |    3 +
 src/chrome/locale/ha/torbutton.dtd           |    2 +-
 src/chrome/locale/ha/torbutton.properties    |    3 +
 src/chrome/locale/he/torbutton.dtd           |   44 +++---
 src/chrome/locale/he/torbutton.properties    |    3 +
 src/chrome/locale/hi/torbutton.dtd           |    2 +-
 src/chrome/locale/hi/torbutton.properties    |    3 +
 src/chrome/locale/hr/torbutton.dtd           |   46 +++---
 src/chrome/locale/hr/torbutton.properties    |    3 +
 src/chrome/locale/ht/torbutton.dtd           |    2 +-
 src/chrome/locale/ht/torbutton.properties    |    3 +
 src/chrome/locale/hu/torbutton.properties    |    3 +
 src/chrome/locale/hy/torbutton.dtd           |    2 +-
 src/chrome/locale/hy/torbutton.properties    |    3 +
 src/chrome/locale/id/torbutton.properties    |    3 +
 src/chrome/locale/is/torbutton.dtd           |    2 +-
 src/chrome/locale/is/torbutton.properties    |    3 +
 src/chrome/locale/it/torbutton.properties    |    3 +
 src/chrome/locale/ja/torbutton.dtd           |    2 +-
 src/chrome/locale/ja/torbutton.properties    |   57 +++---
 src/chrome/locale/jv/torbutton.dtd           |    2 +-
 src/chrome/locale/jv/torbutton.properties    |    3 +
 src/chrome/locale/ka/torbutton.dtd           |    2 +-
 src/chrome/locale/ka/torbutton.properties    |    3 +
 src/chrome/locale/km/torbutton.dtd           |    2 +-
 src/chrome/locale/km/torbutton.properties    |    3 +
 src/chrome/locale/kn/torbutton.dtd           |    2 +-
 src/chrome/locale/kn/torbutton.properties    |    3 +
 src/chrome/locale/ko/torbutton.dtd           |    2 +-
 src/chrome/locale/ko/torbutton.properties    |    3 +
 src/chrome/locale/ku/torbutton.dtd           |    2 +-
 src/chrome/locale/ku/torbutton.properties    |    3 +
 src/chrome/locale/kw/torbutton.dtd           |    2 +-
 src/chrome/locale/kw/torbutton.properties    |    3 +
 src/chrome/locale/ky/torbutton.dtd           |    2 +-
 src/chrome/locale/ky/torbutton.properties    |    3 +
 src/chrome/locale/lb/torbutton.dtd           |    2 +-
 src/chrome/locale/lb/torbutton.properties    |    3 +
 src/chrome/locale/ln/torbutton.dtd           |    2 +-
 src/chrome/locale/ln/torbutton.properties    |    3 +
 src/chrome/locale/lo/torbutton.dtd           |    2 +-
 src/chrome/locale/lo/torbutton.properties    |    3 +
 src/chrome/locale/lt/torbutton.dtd           |    2 +-
 src/chrome/locale/lt/torbutton.properties    |    3 +
 src/chrome/locale/lv/torbutton.dtd           |    2 +-
 src/chrome/locale/lv/torbutton.properties    |    3 +
 src/chrome/locale/mg/torbutton.dtd           |    2 +-
 src/chrome/locale/mg/torbutton.properties    |    3 +
 src/chrome/locale/mi/torbutton.dtd           |    2 +-
 src/chrome/locale/mi/torbutton.properties    |    3 +
 src/chrome/locale/mk/torbutton.dtd           |    2 +-
 src/chrome/locale/mk/torbutton.properties    |    3 +
 src/chrome/locale/ml/torbutton.dtd           |    2 +-
 src/chrome/locale/ml/torbutton.properties    |    3 +
 src/chrome/locale/mn/torbutton.dtd           |    2 +-
 src/chrome/locale/mn/torbutton.properties    |    3 +
 src/chrome/locale/mr/torbutton.dtd           |    2 +-
 src/chrome/locale/mr/torbutton.properties    |    3 +
 src/chrome/locale/ms/torbutton.dtd           |    2 +-
 src/chrome/locale/ms/torbutton.properties    |    3 +
 src/chrome/locale/mt/torbutton.dtd           |    2 +-
 src/chrome/locale/mt/torbutton.properties    |    3 +
 src/chrome/locale/my/torbutton.dtd           |  256 +++++++++++++-------------
 src/chrome/locale/my/torbutton.properties    |   87 +++++-----
 src/chrome/locale/nah/torbutton.dtd          |    2 +-
 src/chrome/locale/nah/torbutton.properties   |    3 +
 src/chrome/locale/nap/torbutton.dtd          |    2 +-
 src/chrome/locale/nap/torbutton.properties   |    3 +
 src/chrome/locale/nb/torbutton.properties    |    3 +
 src/chrome/locale/ne/torbutton.dtd           |    2 +-
 src/chrome/locale/ne/torbutton.properties    |    3 +
 src/chrome/locale/nl/torbutton.properties    |    3 +
 src/chrome/locale/nn/torbutton.dtd           |    2 +-
 src/chrome/locale/nn/torbutton.properties    |    3 +
 src/chrome/locale/nso/torbutton.dtd          |    2 +-
 src/chrome/locale/nso/torbutton.properties   |    3 +
 src/chrome/locale/oc/torbutton.dtd           |    2 +-
 src/chrome/locale/oc/torbutton.properties    |    3 +
 src/chrome/locale/or/torbutton.dtd           |    2 +-
 src/chrome/locale/or/torbutton.properties    |    3 +
 src/chrome/locale/pa/torbutton.dtd           |    2 +-
 src/chrome/locale/pa/torbutton.properties    |    3 +
 src/chrome/locale/pap/torbutton.dtd          |    2 +-
 src/chrome/locale/pap/torbutton.properties   |    3 +
 src/chrome/locale/pl/torbutton.properties    |    3 +
 src/chrome/locale/pms/torbutton.dtd          |    2 +-
 src/chrome/locale/pms/torbutton.properties   |    3 +
 src/chrome/locale/ps/torbutton.dtd           |    2 +-
 src/chrome/locale/ps/torbutton.properties    |    3 +
 src/chrome/locale/pt-BR/torbutton.properties |   17 +-
 src/chrome/locale/pt/torbutton.dtd           |   76 ++++----
 src/chrome/locale/pt/torbutton.properties    |    3 +
 src/chrome/locale/ro/torbutton.properties    |   17 +-
 src/chrome/locale/ru/torbutton.dtd           |   18 +-
 src/chrome/locale/ru/torbutton.properties    |   17 +-
 src/chrome/locale/sco/torbutton.dtd          |    2 +-
 src/chrome/locale/sco/torbutton.properties   |    3 +
 src/chrome/locale/sk/torbutton.dtd           |    2 +-
 src/chrome/locale/sk/torbutton.properties    |   25 ++-
 src/chrome/locale/sl/torbutton.dtd           |    6 +-
 src/chrome/locale/sl/torbutton.properties    |   17 +-
 src/chrome/locale/so/torbutton.dtd           |    2 +-
 src/chrome/locale/so/torbutton.properties    |    3 +
 src/chrome/locale/son/torbutton.dtd          |    2 +-
 src/chrome/locale/son/torbutton.properties   |    3 +
 src/chrome/locale/sq/torbutton.dtd           |    2 +-
 src/chrome/locale/sq/torbutton.properties    |    3 +
 src/chrome/locale/sr/torbutton.dtd           |   72 ++++----
 src/chrome/locale/sr/torbutton.properties    |   17 +-
 src/chrome/locale/st/torbutton.dtd           |    2 +-
 src/chrome/locale/st/torbutton.properties    |    3 +
 src/chrome/locale/su/torbutton.dtd           |    2 +-
 src/chrome/locale/su/torbutton.properties    |    3 +
 src/chrome/locale/sv/torbutton.dtd           |    2 +-
 src/chrome/locale/sv/torbutton.properties    |    3 +
 src/chrome/locale/sw/torbutton.dtd           |    2 +-
 src/chrome/locale/sw/torbutton.properties    |    3 +
 src/chrome/locale/ta/torbutton.dtd           |    2 +-
 src/chrome/locale/ta/torbutton.properties    |    3 +
 src/chrome/locale/te/torbutton.dtd           |    2 +-
 src/chrome/locale/te/torbutton.properties    |    3 +
 src/chrome/locale/tg/torbutton.dtd           |    2 +-
 src/chrome/locale/tg/torbutton.properties    |    3 +
 src/chrome/locale/th/torbutton.dtd           |    2 +-
 src/chrome/locale/th/torbutton.properties    |    3 +
 src/chrome/locale/ti/torbutton.dtd           |    2 +-
 src/chrome/locale/ti/torbutton.properties    |    3 +
 src/chrome/locale/tk/torbutton.dtd           |    2 +-
 src/chrome/locale/tk/torbutton.properties    |    3 +
 src/chrome/locale/tr/torbutton.properties    |   17 +-
 src/chrome/locale/uk/torbutton.dtd           |    2 +-
 src/chrome/locale/uk/torbutton.properties    |    3 +
 src/chrome/locale/ur/torbutton.dtd           |    2 +-
 src/chrome/locale/ur/torbutton.properties    |    3 +
 src/chrome/locale/ve/torbutton.dtd           |    2 +-
 src/chrome/locale/ve/torbutton.properties    |    3 +
 src/chrome/locale/vi/torbutton.dtd           |    2 +-
 src/chrome/locale/vi/torbutton.properties    |    3 +
 src/chrome/locale/wa/torbutton.dtd           |    2 +-
 src/chrome/locale/wa/torbutton.properties    |    3 +
 src/chrome/locale/wo/torbutton.dtd           |    2 +-
 src/chrome/locale/wo/torbutton.properties    |    3 +
 src/chrome/locale/zh-CN/torbutton.dtd        |   12 +-
 src/chrome/locale/zh-CN/torbutton.properties |    3 +
 src/chrome/locale/zh-HK/torbutton.dtd        |    2 +-
 src/chrome/locale/zh-HK/torbutton.properties |    3 +
 src/chrome/locale/zh-TW/torbutton.dtd        |   14 +-
 src/chrome/locale/zh-TW/torbutton.properties |   39 ++--
 src/chrome/locale/zu/torbutton.dtd           |    2 +-
 src/chrome/locale/zu/torbutton.properties    |    3 +
 216 files changed, 1076 insertions(+), 728 deletions(-)

diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/af/torbutton.properties b/src/chrome/locale/af/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/af/torbutton.properties
+++ b/src/chrome/locale/af/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ak/torbutton.dtd
+++ b/src/chrome/locale/ak/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ak/torbutton.properties b/src/chrome/locale/ak/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ak/torbutton.properties
+++ b/src/chrome/locale/ak/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/am/torbutton.dtd
+++ b/src/chrome/locale/am/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/am/torbutton.properties b/src/chrome/locale/am/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/am/torbutton.properties
+++ b/src/chrome/locale/am/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index caa3a1a..008fef1 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = Ù?بدÙ? Ø£Ù?Ù? تستخدÙ? زر تÙ?ر Ù?ع Ù?اÙ?ر
 torbutton.popup.pref_error = Ù?ا Ù?Ù?Ù?Ù? Ù?زر تÙ?ر تحدÙ?Ø« اÙ?تÙ?ضÙ?Ù?ات Ù?Ù? Ù?جÙ?د Ù?تصÙ?Ø­ تÙ?ر.
 torbutton.popup.permission_denied = Ù?رجÙ? Ø£Ù? تÙ?Ù?Ù? بتغÙ?Ù?ر اÙ?صÙ?احÙ?ات Ù?Ù?جÙ?د Ù?تصÙ?Ø­ تÙ?ر Ø£Ù? Ù?Ù? بÙ?Ù?Ù?Ù? Ù?Ù?Ù?اÙ? آخر.
 torbutton.popup.device_full = Ù?بدÙ? Ø£Ù? اÙ?Ù?رص Ù?Ù?تÙ?ئ. Ù?رجÙ? تÙ?سÙ?ع Ù?ساحة  Ø£Ù?ثر Ø£Ù? Ù?Ù? بÙ?Ù?Ù? Ù?تصÙ?Ø­ تÙ?ر Ø¥Ù?Ù? Ù?حدة تخزÙ?Ù? أخرÙ?.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/arn/torbutton.dtd
+++ b/src/chrome/locale/arn/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/arn/torbutton.properties b/src/chrome/locale/arn/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/arn/torbutton.properties
+++ b/src/chrome/locale/arn/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ast/torbutton.dtd
+++ b/src/chrome/locale/ast/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ast/torbutton.properties b/src/chrome/locale/ast/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ast/torbutton.properties
+++ b/src/chrome/locale/ast/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/az/torbutton.dtd
+++ b/src/chrome/locale/az/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/az/torbutton.properties b/src/chrome/locale/az/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/az/torbutton.properties
+++ b/src/chrome/locale/az/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/be/torbutton.dtd
+++ b/src/chrome/locale/be/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/be/torbutton.properties b/src/chrome/locale/be/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/be/torbutton.properties
+++ b/src/chrome/locale/be/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/bg/torbutton.properties b/src/chrome/locale/bg/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/bg/torbutton.properties
+++ b/src/chrome/locale/bg/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/bn-IN/torbutton.dtd
+++ b/src/chrome/locale/bn-IN/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/bn-IN/torbutton.properties b/src/chrome/locale/bn-IN/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/bn-IN/torbutton.properties
+++ b/src/chrome/locale/bn-IN/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/bn/torbutton.dtd
+++ b/src/chrome/locale/bn/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/bn/torbutton.properties b/src/chrome/locale/bn/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/bn/torbutton.properties
+++ b/src/chrome/locale/bn/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/bo/torbutton.properties b/src/chrome/locale/bo/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/bo/torbutton.properties
+++ b/src/chrome/locale/bo/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/br/torbutton.dtd
+++ b/src/chrome/locale/br/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/br/torbutton.properties b/src/chrome/locale/br/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/br/torbutton.properties
+++ b/src/chrome/locale/br/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/bs/torbutton.dtd
+++ b/src/chrome/locale/bs/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/bs/torbutton.properties b/src/chrome/locale/bs/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/bs/torbutton.properties
+++ b/src/chrome/locale/bs/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index bcad7f9..9d0ec7e 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index e5ca1fc..ba64026 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (vital)
 torbutton.popup.external.title = Voleu carregar els continguts externs?
 torbutton.popup.external.app = Es necessita una aplicació externa per a manejar:\n\n
 torbutton.popup.external.note = \n\nAvís: les aplicacions externes no estan adaptades a Tor per defecte i podrien revelar la vostra identitat.\n
-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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nSi aquest arxiu no és de fiar, haurieu o bé desar-lo per inspeccionar-lo desconectat o a una VM (màquina virtual),\n o bé considerar a usar un proxy transparent per Tor tipus Tails LiveCD o torsocks.\n
 torbutton.popup.launch = Inicia l'aplicació
 torbutton.popup.cancel = Cancel·la
 torbutton.popup.dontask = Inicia les aplicacions automàticament
@@ -34,9 +34,12 @@ torbutton.popup.captcha.ask = Torbutton ha detectat un Captcha de Google. Voleu
 torbutton.popup.captcha.always = Realitza sempre aquesta acció
 torbutton.popup.redirect = Redirecciona
 torbutton.popup.no_redirect = No redireccionis
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Per donar-vos més privacitat, Torbutton pot demanar la versió en anglès de les pàgines web. Això pot provocar que pàgines web que preferiu veure a la vostra llengua nativa siguin mostrades en anglès.\n\nDesitjeu demanar les pàgines web en anglès per una major privacitat?
+torbutton.popup.no_newnym = Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposa d'accés al Tor Control Port.\n\nEsteu usant Tor Browser Bundle?
+torbutton.popup.use_tbb = Sembla que esteu usant Torbutton amb Firefox, el qual ja no és una configuració segura recomanada.\n\nAl seu lloc, recomanem que obtingueu l'últim Tor Browser Bundle enviant un email a gettor@xxxxxxxxxxxxxx o bé descarregant-lo de l'adreça següent:
+torbutton.popup.pref_error = Torbutton no pot actualitzar les preferències al directori de perfil del Tor Browser.
+torbutton.popup.permission_denied = Siusplau, o bé re-inicieu els permisos del directori Tor Browser o copieu-lo a una nova ubicació.
+torbutton.popup.device_full = Sembla que el disc és ple. Siusplau allibereu espai o moveu Tor Browser a un nou dispositiu.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 24b7e78..e60e73f 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -1,5 +1,5 @@
 <!ENTITY torbutton.prefs.title "Nastavení Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
+<!ENTITY torbutton.prefs.display_settings "Zobrazit nastavení">
 <!ENTITY torbutton.prefs.display_panel "Zobrazit nastavení proxy serveru ve stavovém Å?ádku">
 <!ENTITY torbutton.prefs.panel_format "Formát zobrazení status baru">
 <!ENTITY torbutton.prefs.panel_text_format "Text">
@@ -26,7 +26,7 @@
 <!ENTITY torbutton.pref_connection.notice "Zakázat aplikaci Torbutton toto nastavení mÄ?nit.">
 <!ENTITY torbutton.pref_connection.more_info "Více informací">
 <!ENTITY torbutton.pref_connection_more_info.title "NápovÄ?da">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton 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.pref_connection_more_info.text "Torbutton je momentálnÄ? zapnutý.    Pokud chcete zmÄ?nit vaÅ¡e non-Tor proxy nastavení, vypnÄ?te prosím Torbutton a vraÅ¥te se.    Pokud chcete zmÄ?nit vaÅ¡e Tor nastavení, použijte prosím okno nastavení Torbutton">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.toggle "ZmÄ?nit Tor status">
@@ -35,22 +35,22 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "O Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "Ochrana pÅ?ed cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.copyTor "Kopírovat Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "P">
+<!ENTITY torbutton.context_menu.openTorTab "OtevÅ?ít Tor URL v nové záložce">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "OtevÅ?ít Tor URL v novém oknÄ?">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "KliknÄ?te pro inicializaci Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "BezpeÄ?nostní nastavení">
-<!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.block_thread "Blokovat Ä?tení historie pÅ?i používání Tor (kritické)">
+<!ENTITY torbutton.prefs.block_thwrite "Blokovat zápis do historie pÅ?i používání Tor (doporuÄ?eno)">
+<!ENTITY torbutton.prefs.block_nthread "Blokovat Ä?tení historie bÄ?hem Non-Tor (volitelné)">
+<!ENTITY torbutton.prefs.block_nthwrite "Blokovat zápis do historie pÅ?i používání Non-Tor (volitelné)">
+<!ENTITY torbutton.prefs.clear_history "Vymazat historii pÅ?i pÅ?epnutí Tor (volitelné)">
 <!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">
diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties
index de52396..1ee8fec 100644
--- a/src/chrome/locale/cs/torbutton.properties
+++ b/src/chrome/locale/cs/torbutton.properties
@@ -2,41 +2,44 @@ torbutton.button.tooltip.disabled = Povolit Tor
 torbutton.button.tooltip.enabled = Zakázat Tor
 torbutton.panel.tooltip.disabled = Klikni pro povolení Tor
 torbutton.panel.tooltip.enabled = Klikni pro zakázání Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.plugins.disabled = KliknÄ?te pro povolení pluginů
+torbutton.panel.plugins.enabled = KliknÄ?te k zakázání pluginů
 torbutton.panel.label.disabled = Tor Zapnut
 torbutton.panel.label.enabled = Tor Vypnut
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton poskytuje tlaÄ?ítko k lehkému pÅ?emostÄ?ní Firefoxu na Tor Proxy
+torbutton.popup.history.warning = Torbutton zablokoval aktivitu ze záložky nahrané v jiném stavu Tor\n\nTím obeÅ¡el Firefox chyby 409737 a 417869\n\nPokud se toto vyskakovací okno zapnulo bezdůvodnÄ?, jedna z vaÅ¡ich záložek se snaží znovunaÄ?íst v pozadí a tato akce byla zablokována.\n\nPro nahrání záložky v tomto Tor stavu kliknÄ?te do adresáÅ?e a stisknÄ?te Enter\n
+torbutton.popup.plugin.warning = Torbutton zablokoval pÅ?ímé naÄ?tení obsahu plugin\n\nZkuste použít Uložit jako\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-torbutton.popup.ff3.warning = 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.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 Tails LiveCD or torsocks.\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
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.ff3.warning = Varování!\n\nTorbutton ve Firefox 3 obÄ?as vypouÅ¡tí VaÅ¡i Ä?asovou zónu a pozici pÅ?es Tor.\n\nPÅ?ejete si pÅ?esto pokraÄ?ovat?
+torbutton.popup.toggle.warning = Musíte pÅ?epnout Tor anebo restartovat, aby Vámi provedené zmÄ?ny pÅ?eÅ¡ly v platnost.
+torbutton.popup.test.success = Test Tor proxy byl úspÄ?Å¡ný!
+torbutton.popup.test.failure = Test Tor proxy SELHAL! Zkontrolujte své nastavení proxy a Polipo.
+torbutton.popup.test.confirm_toggle = Poslednímu proxy testu se nepodaÅ?ilo použít Tor.\n\nChcete ho pÅ?esto zapnout?\n\nPoznámka: Pokud jste problém opravili, můžete znovu rozbÄ?hnout test v oknÄ? Nastavení Torbutton Proxy; pokud bude úspÄ?Å¡ný, tato zpráva se již nebude zobrazovat.
+torbutton.popup.test.ff3_notice = KliknÄ?te OK k otestování Tor proxy nastavení. Tento test probÄ?hne na pozadí. Prosíme o strpení.
+torbutton.panel.label.verified = Tor ovÄ?Å?en
+torbutton.popup.test.auto_failed = Automatický Tor proxy test nemohl použít Tor.\n\nChcete ho pÅ?esto zapnout?
+torbutton.prefs.recommended = (doporuÄ?eno)
+torbutton.prefs.optional = (volitelné)
+torbutton.prefs.crucial = (důležité)
+torbutton.popup.external.title = NaÄ?íst vnÄ?jší obsah?
+torbutton.popup.external.app = Je potÅ?eba vnÄ?jší aplikace k jednání s: \n
+torbutton.popup.external.note = \nPOZNÃ?MKA: VnÄ?jší aplikace NEJSOU Torem zabezpeÄ?ené a mohou odkrýt VaÅ¡e informace!\n
+torbutton.popup.external.suggest = \nPokud tomuto souboru nevÄ?Å?íte, můžete ho buÄ? uložit a prohlédnout ho offline nebo ve VM, nebo zkusit použít průhlednou Tor proxy jako napÅ?. Tails LiveCD nebo torsocks\n
+torbutton.popup.launch = Spustit aplikaci
+torbutton.popup.cancel = Zrušit
+torbutton.popup.dontask = OdteÄ? vždy spouÅ¡tÄ?t aplikace
+torbutton.popup.test.no_http_proxy = Tor proxy test: Místní HTTP proxy je nedosažitelná. Funguje Polipo správnÄ??
+torbutton.popup.captcha.title = Vyhýbat se Google Captchas?
+torbutton.popup.captcha.ask = Torbutton odhalil Google Captcha. ChtÄ?li byste tento termín vyhledat na jiné stránce?
+torbutton.popup.captcha.always = OdteÄ? vždy provádÄ?t tuto akci
+torbutton.popup.redirect = PÅ?esmÄ?rovat
+torbutton.popup.no_redirect = NepÅ?esmÄ?rovat
+torbutton.popup.prompted_language = K poskytnutí vÄ?tšího soukromí, Torbutton může požadovat anglickou verzi internetových stránek. Stránky které chcete Ä?íst ve svém jazyce se mohou zobrazit namísto toho v angliÄ?tinÄ?.\n\nChtÄ?li byste požadovat anglicky psané stránky pro vÄ?tší soukromí?
+torbutton.popup.no_newnym = Torbutton nemůže bezpeÄ?nÄ? poskytnout novou identitu. Nemá pÅ?ístup k pÅ?ístupovému portu Tor.\n\nMáte spuÅ¡tÄ?n Tor Browser Bundle?
 torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/csb/torbutton.dtd
+++ b/src/chrome/locale/csb/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/csb/torbutton.properties b/src/chrome/locale/csb/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/csb/torbutton.properties
+++ b/src/chrome/locale/csb/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/cy/torbutton.dtd
+++ b/src/chrome/locale/cy/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/cy/torbutton.properties b/src/chrome/locale/cy/torbutton.properties
index afa28f1..491ef3b 100644
--- a/src/chrome/locale/cy/torbutton.properties
+++ b/src/chrome/locale/cy/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 1eff91a..f705743 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -85,7 +85,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ikke-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ved session genoprettelses start, sæt Tor tilstanden til:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "Når browser opstartes, så angive Tor-tilstanden til:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Genindlæs cookie jar/ryd cookies ved Firefox crash (anbefales)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Gem både Tor og Ikke-Tor cookies i beskyttede krukker (farlige)">
 <!ENTITY torbutton.prefs.clear_http_auth "Ryd HTTP auth sessioner (anbefales)">
@@ -137,11 +137,11 @@
 <!ENTITY torbutton.prefs.dtd_optional "(Valg frit)">
 <!ENTITY torbutton.prefs.dtd_crucial "(Vigtigt)">
 <!ENTITY torbutton.prefs.update_torbutton_via_tor "Videredirigér Torbutton-opdateringer gennem Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Brug automatisk en anden søgemaskine når du stilles overfor en Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.fix_google_srch "Fjern platform og sprog fra forespørgsler i Google-søgninger">
+<!ENTITY torbutton.prefs.transparentTor "Gennemsigtig Torifikation (Kræver tilpasset transproxy eller Tor-router)">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index e5bb398..0a1d60a 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -7,36 +7,39 @@ 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 blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.history.warning = Torbutton blokerede aktivitet fra en fane indlæst i en anden Tor-tilstand.\n\nDette sker for at omgå Firefox-fejlene 409737 og 417869.\n\nHvis denne pop-op synes at ske uden grund, så forsøger én af dine faner\nat genindlæse sig selv i baggrunden, og dette blev blokeret.\n\nFor at genindlæse fanen i denne Tor-tilstand, så tast 'Retur' URL-adressen.\n\n
 torbutton.popup.plugin.warning = Torbutton blokerede for direkte indlæsning af Tor plugin indhold.\n\nBrug 'Gem som' i stedet.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Bemærkning: Det ser ud til du ikke har nogen brugerdefinerede nøglecentre. Analysen af den globale godkendelsesmyndighedsliste er langsom og sløver skift Tor status. Vil du deaktiverer isolationen af nøglecentre certifikater? (Hvis du ikke forstår dette, er det sikkert at trykke OK)
 torbutton.popup.ff3.warning = Advarsel!\n\nTorbutton er på Firefox kendt for at lække informationer om din tidszone og livemarks via Tor.\n\n�nsker du at fortsætte alligevel?
 torbutton.popup.toggle.warning = Du skal ændre Tor status eller genstarte for at dine ændringer træder i kraft.
 torbutton.popup.test.success = Tor proxy test lykkedes!
 torbutton.popup.test.failure = Tor proxy test MISLYKKEDES! Kontroller dine proxy og Privoxy indstillinger.
-torbutton.popup.test.confirm_toggle = 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 = Den seneste Tor-proxy-test mislykkedes i brug af Tor.\n\nEr du sikker på at du vil aktivere alligevel?\n\nBemærk: Hvis du har rettet dette problem, så kan du igen køre testen i\nindstillinger for Torbutton Proxy-vinduet for at fjerne denne advarsel.
 torbutton.popup.test.ff3_notice = Klik på OK for at teste Tor proxyindstillinger. Denne test vil køre i baggrunden. Vær venligst tålmodig.
 torbutton.panel.label.verified = Tor Verificeret
 torbutton.popup.test.auto_failed = Det mislykkedes den automatiske Tor proxy test at benytte Tor.\n\nEr du sikker på du vil aktivere alligevel?
 torbutton.prefs.recommended = (anbefalet)
 torbutton.prefs.optional = (valgfri)
 torbutton.prefs.crucial = (afgørende)
-torbutton.popup.external.title = 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 Tails LiveCD or torsocks.\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
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.external.title = Indlæs eksternt indhold?
+torbutton.popup.external.app = Et ekstern program kræves for at håndtere:\n\n
+torbutton.popup.external.note = \n\nBEMÃ?RK: Eksterne programmer er IKKE Tor-sikre som standard og kan demaskere dig!\n
+torbutton.popup.external.suggest = \nHvis der ikke stoles på denne fil, så bør du enten gemme den til visning når du er koblet af nettet eller i en VM, eller overveje at anvende en transparent Tor-proxy som Tails LiveCD eller torsocks.\n
+torbutton.popup.launch = Start program
+torbutton.popup.cancel = Annullér
+torbutton.popup.dontask = Start altid programmer fremover
+torbutton.popup.test.no_http_proxy = Tor-proxy-test: Lokal HTTP-proxy kan ikke nås. Kører Polipo korrekt?
+torbutton.popup.captcha.title = Undgå Google Captchas?
+torbutton.popup.captcha.ask = Torbutton registrerede en Google Captcha. �nsker du at blive videredirigeret til en anden søgemaskine for denne forespørgsel?
+torbutton.popup.captcha.always = Udfør altid denne handling fremover
+torbutton.popup.redirect = Videredirigér
+torbutton.popup.no_redirect = Undlad at videredirigere
+torbutton.popup.prompted_language = For at yde større privatliv, så kan Torbutton forespørge den engelsk sprogversion af websiderne. Dette kan betyde at websider som du foretrækker at læse på dit modersmål vises på engelsk i stedet for.\n\nVil du gerne forespørge engelske websider for øget privatliv?
+torbutton.popup.no_newnym = Torbutton kan ikke med sikkerhed give dig en ny identitet. Den har ikke adgang til kontrolporten for Tor.\n\nKører du Tor Browser-bundet?
+torbutton.popup.use_tbb = Det ser ud til at du bruger Torbutton med Firefox, hvilket ikke længere kan anbefales som en sikker konfiguration.\n\nI stedet anbefaler vi at du skaffer de seneste Tor Browser-bundt ved at sende e-post til gettor@xxxxxxxxxxxxxx eller henter den på følgende URL: 
+torbutton.popup.pref_error = Torbutton kan ikke opdatere præferencer i profil-kataloget for Tor Browser.
+torbutton.popup.permission_denied = Nulstil venligst rettighederne for Tor Browser-kataloget eller kopiér det til en ny placering.
+torbutton.popup.device_full = Disken ser ud til at være fuld. Frigør venligst plads eller flyt Tor Browser til en ny enhed.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index b169700..0e7c48c 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -1,14 +1,14 @@
-torbutton.button.tooltip.disabled = Tor aktivieren
+torbutton.button.tooltip.disabled = Enable Tor
 torbutton.button.tooltip.enabled = Tor deaktivieren
-torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
+torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
-torbutton.panel.plugins.disabled = Klicken, um Plugins zu aktivieren
+torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Klicken, um Plugins zu deaktivieren
 torbutton.panel.label.disabled = Tor deaktiviert
-torbutton.panel.label.enabled = Tor aktiviert
+torbutton.panel.label.enabled = Tor Enabled
 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 blockierte eine Aktivität eines Tabs welcher in einem anderen Torstatus geladen wurde.\n\nDies wurde getan, um die Firefox Fehler 409737 und 417869 zu umgehen.\n\nFalls dieses Popup Fenster ohne Grund aufgerufen wurde, könnte einer Ihrer Tabs versucht haben sich selber wieder zu neu im Hintergrund zu laden -- was von Torbutton verhindert wurde.\n\nUm den Tab im aktuellen Torstatus zu laden, drücken Sie die 'Enter' Taste im URL Addressfeld.\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.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was 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 = 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
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = Es scheint, als würdest du Torbutton zusammen mit Fre
 torbutton.popup.pref_error = Torbutton kann Einstellungen in dem Tor-Browser Verzeichniss nicht aktualisieren.
 torbutton.popup.permission_denied = Bitte setze entweder die Berechtigungen des Tor-Browser Verzeichnisses zurück, oder kopiere es an einen neuen Ort.
 torbutton.popup.device_full = Es scheint als würde die Disk voll sein. Bitte machen sie etwas Platz frei, oder bewegen sie den Tor-Browser auf ein neues Gerät.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/dz/torbutton.dtd
+++ b/src/chrome/locale/dz/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/dz/torbutton.properties b/src/chrome/locale/dz/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/dz/torbutton.properties
+++ b/src/chrome/locale/dz/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 29c7c96..3c74a8b 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/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 :">
@@ -16,32 +16,32 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "Î?ενÏ?Ï?ικÏ?Ï? Ï?Ï?ολογιÏ?Ï?ήÏ? SOCKS :">
 <!ENTITY torbutton.prefs.proxy.port "Î?Ï?Ï?α :">
 <!ENTITY torbutton.about.title "ΠεÏ?ί Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
+<!ENTITY torbutton.about.version "Î?κδοÏ?η">
+<!ENTITY torbutton.about.summary "ΠÏ?οÏ?Ï?αÏ?εÏ?ει Ï?ην ιδιÏ?Ï?ική ζÏ?ή Ï?οÏ? Tor Ï?εÏ?ιήγηÏ?η Ï?αÏ?.">
+<!ENTITY torbutton.about.code "ΣÏ?νÏ?ελεÏ?Ï?έÏ? Î?Ï?δικα:">
+<!ENTITY torbutton.about.maintainer "ΣÏ?νÏ?ηÏ?ηÏ?ήÏ?:">
+<!ENTITY torbutton.about.security_review "Î?ναθεÏ?Ï?ηÏ?η Î?Ï?Ï?αλείαÏ?:">
+<!ENTITY torbutton.about.donate "Î?ν Ï?αÏ? αÏ?έÏ?ει η Ï?Ï?ήÏ?η Ï?οÏ? Tor, θα μÏ?οÏ?οÏ?Ï?ε να λάβεÏ?ε Ï?Ï? 'Ï?Ï?ιν">
+<!ENTITY torbutton.about.make_donation "κάνε μια δÏ?Ï?εά.">
 <!ENTITY torbutton.pref_connection.notice "Î?Ï?ενεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο Torbutton για να αλλάξεÏ?ε αÏ?Ï?έÏ? Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ?.">
 <!ENTITY torbutton.pref_connection.more_info "ΠεÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ?">
 <!ENTITY torbutton.pref_connection_more_info.title "Î?οήθεια">
 <!ENTITY torbutton.pref_connection_more_info.text "Το Torbutton είναι ενεÏ?γοÏ?οιημένο.Î?ν θέλεÏ?ε να αλλάξεÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? διαμεÏ?ολαβηÏ?ή, εκÏ?Ï?Ï? Ï?οÏ? Tor, αÏ?ενεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο Torbutton και εÏ?ιÏ?Ï?Ï?έÏ?Ï?ε εδÏ?. Î?ν θέλεÏ?ε να αλλάξεÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? για Ï?ον διαμεÏ?ολαβηÏ?ή Tor, Ï?Ï?ηÏ?ιμοÏ?οιήÏ?Ï?ε Ï?ο Ï?αÏ?άθÏ?Ï?ο εÏ?ιλογÏ?ν Ï?οÏ? Torbutton">
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
-<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!ENTITY torbutton.context_menu.new_identity "Î?έα ΤαÏ?Ï?Ï?Ï?ηÏ?α">
+<!ENTITY torbutton.context_menu.new_identity_key "Τ">
 <!ENTITY torbutton.context_menu.toggle "Î?ναλλαγή καÏ?άÏ?Ï?αÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ? Ï?οÏ? Tor">
 <!ENTITY torbutton.context_menu.toggle.key "Î?">
 <!ENTITY torbutton.context_menu.preferences "Î?Ï?ιλογέÏ?...">
 <!ENTITY torbutton.context_menu.preferences.key "Î?">
 <!ENTITY torbutton.context_menu.about "ΣÏ?εÏ?ικά με Ï?ο Torbutton">
 <!ENTITY torbutton.context_menu.about.key "Π">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "ΠÏ?οÏ?Ï?αÏ?ία Cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor "Î?νÏ?ιγÏ?αÏ?ή Ï?οÏ? Tor URL">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab "Î?νοιγμα Ï?οÏ? Tor URL Ï?ε νέο Tab">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "Î?νοιγμα Ï?οÏ? Tor URL Ï?ε νέο ΠαÏ?άθÏ?Ï?ο">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Î?άνÏ?ε κλικ για να εκκίνηÏ?η Ï?οÏ? Torbutton">
@@ -54,7 +54,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Î?Ï?αγÏ?Ï?εÏ?Ï?η Ï?Ï?ήÏ?ηÏ? λανθάνοÏ?Ï?αÏ? δίÏ?κοÏ? καÏ?ά Ï?η λειÏ?οÏ?Ï?γία Tor και εκκαθάÏ?ιÏ?η Ï?ηÏ? Ï?Ï?ην εναλλαγή Tor">
 <!ENTITY torbutton.prefs.block_cache "Î?Ï?αγÏ?Ï?εÏ?Ï?η λανθάνοÏ?Ï?αÏ? μνήμηÏ? και δίÏ?κοÏ? καÏ?ά Ï?η λειÏ?οÏ?Ï?γία Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Î?Ï?οθήκεÏ?Ï?η cookies εκÏ?Ï?Ï? Tor Ï?ε Ï?Ï?οÏ?Ï?αÏ?εÏ?μένο αÏ?Ï?είο jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.cookie_protection "Î?Ï?ιλογή μέÏ?Ï? Ï?οÏ? Î?ιαλÏ?γοÏ? ΠÏ?οÏ?Ï?αÏ?ίαÏ? Cookies">
 <!ENTITY torbutton.prefs.mmm_cookies "ΧειÏ?Ï?νακÏ?ική διαÏ?είÏ?ιÏ?η cookies (εÏ?ικίνδÏ?νο)">
 <!ENTITY torbutton.prefs.clear_cookies "Î?κκαθάÏ?ιÏ?η cookies καÏ?ά Ï?ην εναλλαγή Ï?Ï?ήÏ?ηÏ? Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Î?Ï?ενεÏ?γοÏ?οίηÏ?η Ï?Ï?Ï?Ï?θεÏ?Ï?ν λειÏ?οÏ?Ï?γιÏ?ν καÏ?ά Ï?η Ï?Ï?ήÏ?η Tor (κÏ?ίÏ?ιμο)">
@@ -74,9 +74,9 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Î?Ï?ενεÏ?γοÏ?οίηÏ?η αÏ?οθήκεÏ?Ï?ηÏ? Ï?Ï?νεδÏ?ίαÏ? (Ï?Ï?νιÏ?Ï?άÏ?αι)">
 <!ENTITY torbutton.prefs.headers "Î?εÏ?αλίδεÏ?">
 <!ENTITY torbutton.prefs.spoof_english "ΠαÏ?αÏ?λάνηÏ?η Ï?ηÏ? γλÏ?Ï?Ï?αÏ? US English Ï?οÏ? ΠεÏ?ιηγηÏ?ή">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.refererspoofing "ΠαÏ?αÏ?λάνηÏ?η διεÏ?θÏ?νÏ?ηÏ? αναÏ?οÏ?άÏ?">
 <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.smartspoof "ΠαÏ?αÏ?λάνηÏ?η εÏ?Ï?Ï?οÏ?Ï? αναÏ?οÏ?έα καÏ?ά Ï?ην Ï?Ï?ήÏ?η Ï?οÏ? Tor (Ï?αÏ?αÏ?λανεί ">
 <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Î?Ï?ενεÏ?γοÏ?οίηÏ?η αÏ?οθήκεÏ?Ï?ηÏ? DOM καÏ?ά Ï?η Ï?Ï?ήÏ?η Tor (κÏ?ίÏ?ιμο)">
 <!ENTITY torbutton.prefs.forms "Î?νÏ?Ï?Ï?α">
@@ -85,7 +85,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Î?η Tor">
 <!ENTITY torbutton.prefs.restore_tor "Î?Ï?αν γίνεÏ?αι εκκίνηÏ?η με αÏ?οκαÏ?άÏ?Ï?αÏ?η Ï?ηÏ? Ï?Ï?νεδÏ?ίαÏ?, Ï?οÏ?οθέÏ?ηÏ?η Ï?οÏ? Tor Ï?ε καÏ?άÏ?Ï?αÏ?η:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_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 (Ï?Ï?νιÏ?Ï?άÏ?αι)">
@@ -115,24 +115,24 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Î?εν Ï?Ï?άÏ?Ï?οÏ?ν Ï?ληÏ?εξοÏ?Ï?ιοι διακομιÏ?Ï?έÏ? proxy για:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Î?ιδοÏ?οίηÏ?η: Î?Ï?οÏ?Ï?γεÏ?ε Ï?ην  Ï?Ï?ήÏ?η hostnames Ï?ιο Ï?άνÏ?">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.prefs.spoofreresh "Î?νανέÏ?Ï?η Ï?αÏ?αÏ?λάνηÏ?ηÏ?">
+<!ENTITY torbutton.prefs.refereroptions "Î?Ï?ιλογέÏ? Ï?αÏ?αÏ?λάνηÏ?ηÏ? αναÏ?οÏ?έα">
+<!ENTITY torbutton.prefs.nospoof "Î?α μην Ï?αÏ?αÏ?λανείÏ?αι ο αναÏ?οÏ?έαÏ?">
+<!ENTITY torbutton.prefs.spoofroot "ΠαÏ?αÏ?λάνηÏ?η Ï?οÏ? γονικοÏ? καÏ?αλÏ?γοÏ? Ï?ηÏ? Ï?ελίδαÏ?">
+<!ENTITY torbutton.prefs.spoofdomain "ΠαÏ?αÏ?λάνηÏ?η Ï?ηÏ? Ï?εÏ?ιοÏ?ήÏ? Ï?Ï? αναÏ?οÏ?έα">
+<!ENTITY torbutton.prefs.spoofblank "ΦÏ?ιάξε κενέÏ? Ï?αÏ?αÏ?ομÏ?έÏ?">
+<!ENTITY torbutton.cookiedialog.title "Î?ιαÏ?είÏ?ιÏ?η ΠÏ?οÏ?Ï?αÏ?ίαÏ? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "ΠÏ?οÏ?Ï?αÏ?εÏ?μένα">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.domainCol "Î?ικοδεÏ?Ï?Ï?Ï?ηÏ?">
 <!ENTITY torbutton.cookiedialog.nameCol "Î?νομα">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.pathCol "Î?ονοÏ?άÏ?ι">
+<!ENTITY torbutton.cookiedialog.protectCookie "ΠÏ?οÏ?Ï?αÏ?ίαÏ? Cookie">
 <!ENTITY torbutton.cookiedialog.removeCookie "Î?Ï?αίÏ?εÏ?η Cookie">
 <!ENTITY torbutton.cookiedialog.unprotectCookie "Î?εÏ?Ï?οÏ?Ï?άÏ?εÏ?Ï?η Cookie">
 <!ENTITY torbutton.cookiedialog.removeAllBut "Î?Ï?αίÏ?εÏ?η Î?λÏ?ν Î?κÏ?Ï?Ï? αÏ?Ï? Ï?Ï?ν ΠÏ?οÏ?Ï?αÏ?εÏ?μένÏ?ν">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ΠÏ?οÏ?Ï?αÏ?ία Î?έÏ?ν Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Î?α Î?η γίνεÏ?αι ΠÏ?οÏ?Ï?αÏ?ία Î?έÏ?ν Cookie">
-<!ENTITY torbutton.prefs.disable_livemarks "Î?Ï?ενεÏ?γοÏ?οίηÏ?η Ï?Ï?ν ενημεÏ?Ï?Ï?εÏ?ν Ï?οÏ? livemark Ï?Ï?ο Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι Ï?ο Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Î?Ï?ενεÏ?γοÏ?οίηÏ?η Ï?Ï?ν ενημεÏ?Ï?Ï?εÏ?ν Livemark καÏ?ά Ï?η διάÏ?κεια Ï?ηÏ? Ï?Ï?ήÏ?ηÏ? Ï?οÏ? Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(Ï?Ï?νίÏ?Ï?αÏ?αι)">
 <!ENTITY torbutton.prefs.dtd_optional "(Ï?Ï?οεÏ?αιÏ?ικÏ?)">
 <!ENTITY torbutton.prefs.dtd_crucial "(κÏ?ίÏ?ιμο)">
@@ -144,4 +144,4 @@
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Î?Ï?αίÏ?εÏ?ε Ï?ην Ï?λαÏ?Ï?Ï?Ï?μα και Ï?η γλÏ?Ï?Ï?α (Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ?) αÏ?ο Ï?α εÏ?Ï?Ï?ήμαÏ?α Ï?Ï?α κοÏ?Ï?ιά αναζήÏ?ηÏ?ηÏ?">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.transparentTor "Î?ιαÏ?ανήÏ? Torification  (Î?Ï?αιÏ?εί Ï?Ï?οÏ?αÏ?μοÏ?μένο  proxy ή Tor δÏ?ομολογηÏ?ή)">
diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties
index 7b529a0..676e1a6 100644
--- a/src/chrome/locale/el/torbutton.properties
+++ b/src/chrome/locale/el/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 = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.history.warning = Το Tor εμÏ?οδίζει Ï?ην δÏ?αÏ?Ï?ηÏ?ιÏ?Ï?ηÏ?α κάÏ?οιοÏ? tab Ï?οÏ? Ï?οÏ?Ï?Ï?θηκε Ï?ε διαÏ?οÏ?εÏ?ική καÏ?άÏ?Ï?αÏ?η Tor.\n\nÎ?Ï?Ï?Ï? βοηθά Ï?Ï?ην ανÏ?ιμεÏ?Ï?Ï?ιÏ?η Ï?Ï?ν ΣÏ?αλμάÏ?Ï?ν 409737 και 417869 Ï?οÏ? Firefox.\n\nÎ?ν αÏ?Ï?Ï? Ï?ο αναδÏ?Ï?μενο μήνÏ?μα Ï?αίνεÏ?αι να μην έÏ?ει αιÏ?ία, κάÏ?οιο αÏ?Ï? Ï?α tab Ï?Ï?οÏ?Ï?αθεί να εÏ?αναÏ?οÏ?Ï?Ï?θεί Ï?Ï?ο Ï?αÏ?αÏ?κήνιο και έÏ?ει Ï?Ï?αγεί.\n\nÎ?ια να εÏ?αναÏ?οÏ?Ï?Ï?θεί Ï?ο tab Ï?Ï?ην Ï?Ï?έÏ?οÏ?Ï?α καÏ?άÏ?Ï?αÏ?η Ï?οÏ? Tor, Ï?αÏ?ήÏ?Ï?ε 'enter' Ï?Ï?ο Ï?εδίο διεÏ?θÏ?νÏ?η URL.\n\n
 torbutton.popup.plugin.warning = Το Torbutton μÏ?λοκάÏ?ιÏ?ε Ï?ην άμεÏ?η Ï?Ï?Ï?Ï?Ï?Ï?η μέÏ?Ï? Ï?εÏ?ιεÏ?Ï?μενοÏ? Ï?Ï?Ï?Ï?θεÏ?ηÏ? λειÏ?οÏ?Ï?γίαÏ?.\n\nΧÏ?ηÏ?ιμοÏ?οιήÏ?Ï?ε Ï?η λειÏ?οÏ?Ï?γία «Î?Ï?οθήκεÏ?Ï?η Ï?Ï?» ανÏ?ί γι' αÏ?Ï?Ï?.\n\n
 torbutton.popup.confirm_ca_certs = ΣημείÏ?Ï?η Torbutton: ΦαίνεÏ?αι Ï?Ï?Ï? δεν διαθέÏ?εÏ?ε Ï?Ï?οÏ?αÏ?μοζμένεÏ? αÏ?Ï?έÏ? Ï?ιÏ?Ï?οÏ?οίηÏ?ηÏ? (CA) Î? έλεγÏ?οÏ? Ï?ηÏ? λίÏ?Ï?αÏ? αÏ?Ï?Ï?ν Ï?ιÏ?Ï?οÏ?οίηÏ?ηÏ? είναι Ï?Ï?ονοβÏ?Ï?α διαδικαÏ?ία και καθÏ?Ï?Ï?εÏ?εί Ï?ην εναλλαγή Ï?οÏ? Tor. Î?έλεÏ?ε να αÏ?ενεÏ?γοÏ?οιηθεί η αÏ?ομÏ?νοÏ?η Ï?ιÏ?Ï?οÏ?οιηÏ?ικÏ?ν CA; (αν δεν καÏ?αλαβαίνεÏ?ε Ï?ο μήνÏ?μα, μÏ?οÏ?είÏ?ε να κάνεÏ?ε κλικ Ï?Ï?ο Î?Î? με αÏ?Ï?άλεια)
 torbutton.popup.ff3.warning = ΠÏ?οÏ?οÏ?ή!\n\nÎ?ίναι γνÏ?Ï?Ï?Ï? Ï?Ï?ι Ï?ο Torbutton Ï?Ï?ον Firefox 3 διαÏ?Ï?έει Ï?ην ζÏ?νη Ï?Ï?α Ï?αÏ? και Ï?α livemarks Ï?αÏ? μέÏ?Ï? Tor.\n\nÎ?Ï?ιθÏ?μείÏ?ε να Ï?Ï?νεÏ?ίÏ?εÏ?ε Ï?αÏ?' Ï?λ' αÏ?Ï?ά;
@@ -24,19 +24,22 @@ 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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nÎ?ν Ï?ο αÏ?Ï?είο αÏ?Ï?Ï? δεν είναι έμÏ?ιÏ?Ï?ο, Ï?Ï?έÏ?ει να Ï?ο αÏ?οθηκεÏ?Ï?εÏ?ε Ï?Ï?Ï?ε να Ï?ο Ï?Ï?οβάλεÏ?ε Ï?Ï?αν δεν είÏ?Ï?ε Ï?Ï?νδεδεμένοι ή μέÏ?Ï? μιαÏ? VM,\nή να Ï?Ï?ονÏ?ίÏ?εÏ?ε να Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε έναν διαÏ?ανή Ï?ληÏ?εξοÏ?Ï?ιο διακομηÏ?Ï?ή Tor Ï?Ï?Ï?Ï? Ï?ο Tails LiveCD ή Ï?ο torsocks.\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.captcha.title = Î?Ï?οÏ?Ï?γή Ï?ηÏ? λειÏ?οÏ?Ï?γίαÏ? CAPTCHA Ï?ηÏ? Google;
+torbutton.popup.captcha.ask = Το Torbutton ενÏ?Ï?Ï?ιÏ?ε ένα Google Captcha. Î?Ï?ιθÏ?μείÏ?ε να Ï?αÏ? ανακαÏ?εÏ?θÏ?νοÏ?με Ï?ε μια άλλη μηÏ?ανή αναζήÏ?ηÏ?ηÏ? για αÏ?Ï?Ï? Ï?οÏ? Ï?άÏ?νεÏ?ε;
+torbutton.popup.captcha.always = ΣÏ?ο εξήÏ? να εκÏ?ελείÏ?αι Ï?άνÏ?οÏ?ε η ενέÏ?γεια αÏ?Ï?ή
 torbutton.popup.redirect = Î?άνε ανακαÏ?εÏ?θηνÏ?η
 torbutton.popup.no_redirect = Î?ην κάνειÏ? ανακαÏ?εÏ?θηνÏ?η
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Î?ια Ï?ην ενίÏ?Ï?Ï?Ï?η Ï?οÏ? αÏ?οÏ?Ï?ήÏ?οÏ? Ï?αÏ? Ï?ο Torbutton μÏ?οÏ?εί να ζηÏ?ήÏ?ει Ï?ην έκδοÏ?η Ï?ηÏ? αγγλικήÏ? γλÏ?Ï?Ï?αÏ? για Ï?ιÏ? ιÏ?Ï?οÏ?ελίδεÏ?. Î?Ï?Ï?Ï? μÏ?οÏ?εί να έÏ?ει Ï?αν αÏ?οÏ?έλεÏ?μα, οι ιÏ?Ï?οÏ?ελίδεÏ? Ï?οÏ? εÏ?ιλέξαÏ?ε να εμÏ?ανίζονÏ?αι Ï?Ï?ην εθνική Ï?αÏ? γλÏ?Ï?α, να Ï?Ï?οβάλονÏ?αι ανÏ?' αÏ?Ï?ήÏ? Ï?Ï?ην Î?γγλική.\n\nÎ?έλεÏ?ε να αιÏ?οÏ?νÏ?αι Ï?ελίδεÏ? γÏ?αμμένεÏ? Ï?Ï?α Î?γγλικά, για Ï?ην βελÏ?ίÏ?Ï?η Ï?οÏ? αÏ?οÏ?Ï?ήÏ?οÏ?;
+torbutton.popup.no_newnym = Το Torbutton δεν μÏ?οÏ?εί να Ï?αÏ? δÏ?Ï?ει μια αÏ?Ï?αλή νέα Ï?αÏ?Ï?Ï?Ï?ηÏ?α, διÏ?Ï?ι δεν έÏ?ει Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο Tor Control Port:\n\nΧÏ?ηÏ?ιμοÏ?οιείÏ?ε Ï?ο ΠακέÏ?ο ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor;
+torbutton.popup.use_tbb = ΦαίνεÏ?αι Ï?Ï?ι Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε Ï?ο Torbutton μαζί με Firefox, Ï?Ï?νδÏ?αÏ?μÏ?Ï? Ï?οÏ? δεν είναι ο Ï?λεον αÏ?Ï?αλήÏ?.\n\nΣαÏ? Ï?Ï?οÏ?είνοÏ?με να λάβεÏ?ε Ï?ην νεÏ?Ï?εÏ?η έκδοÏ?η Ï?οÏ? ΠακέÏ?οÏ? ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor, Ï?Ï?έλνονÏ?αÏ? ένα email Ï?Ï?η διεÏ?θÏ?νÏ?η gettor@xxxxxxxxxxxxxx ή καÏ?εβάζονÏ?άÏ? Ï?ο αÏ?Ï? Ï?ην ακÏ?λοÏ?θη διεÏ?θÏ?νÏ?η URL:
+torbutton.popup.pref_error = Το Torbutton δεν μÏ?οÏ?εί να ενημεÏ?Ï?Ï?ει Ï?ιÏ? Ï?Ï?οÏ?ιμήÏ?ειÏ? Ï?Ï?ον καÏ?άλογο Ï?οÏ? Ï?Ï?οÏ?ίλ Ï?αÏ?Ï?οÏ? ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor.
+torbutton.popup.permission_denied = ΠαÏ?ακαλοÏ?με είÏ?ε να εÏ?αναÏ?έÏ?εÏ?ε Ï?ιÏ? άδειεÏ? Ï?οÏ? καÏ?αλÏ?γοÏ? ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor είÏ?ε να Ï?ον ανÏ?ιγÏ?άÏ?εÏ?ε Ï?ε μια νέα Ï?οÏ?οθεÏ?ία.
+torbutton.popup.device_full = Î? δίÏ?κοÏ? Ï?αίνεÏ?αι Ï?Ï?ι είναι γεμάÏ?οÏ?. ΠαÏ?ακαλοÏ?με ελεÏ?θεÏ?Ï?Ï?Ï?ε Ï?Ï?Ï?ο Ï?Ï?ον δίÏ?κο ή μεÏ?ακινήÏ?Ï?ε Ï?ον ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor Ï?ε κάÏ?οιον άλλο δίÏ?κο.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd
index 551cd5b..c5b1af4 100644
--- a/src/chrome/locale/eo/torbutton.dtd
+++ b/src/chrome/locale/eo/torbutton.dtd
@@ -1,21 +1,21 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
+<!ENTITY torbutton.prefs.title "Agordoj de Torbutton">
+<!ENTITY torbutton.prefs.display_settings "Fasadâ??agordoj">
 <!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
 <!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.tor_settings "Retperantâ??agordoj">
 <!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.use_privoxy "Uzi Privoxyâ??on">
+<!ENTITY torbutton.prefs.use_polipo "Uzi Polipoâ??n">
 <!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.http "HTTPâ??peranto:">
+<!ENTITY torbutton.prefs.proxy.host.https "SSLâ??peranto:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "FTPâ??peranto:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Gopherâ??peranto:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.prefs.proxy.port "Pordo:">
+<!ENTITY torbutton.about.title "Pri Torbutton">
 <!ENTITY torbutton.about.version "Version:">
 <!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
 <!ENTITY torbutton.about.code "Code Contributors:">
@@ -31,10 +31,10 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.preferences "Agordojâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "A">
+<!ENTITY torbutton.context_menu.about "Pri Torbuttonâ?¦">
+<!ENTITY torbutton.context_menu.about.key "P">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
@@ -45,7 +45,7 @@
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.sec_settings "Sekurec-agordoj">
 <!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)">
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/eo/torbutton.properties b/src/chrome/locale/eo/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/eo/torbutton.properties
+++ b/src/chrome/locale/eo/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index b59d07f..02cfb71 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = Parece que está usando Torbutton con Firefox, lo cuá
 torbutton.popup.pref_error = Torbutton no puede actualizar las preferencias en el directorio de perfiles del Navegador de Tor.
 torbutton.popup.permission_denied = Por favor reinicie los permisos del directorio del Navegador Tor o cópielo a una nueva ubicación.
 torbutton.popup.device_full = El disco parece estar lleno. Por favor libere espacio o mueva el Navegador Tor a un nuevo dispositivo.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd
index 44b2171..6f0926d 100644
--- a/src/chrome/locale/et/torbutton.dtd
+++ b/src/chrome/locale/et/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/et/torbutton.properties b/src/chrome/locale/et/torbutton.properties
index aeae300..e40b20e 100644
--- a/src/chrome/locale/et/torbutton.properties
+++ b/src/chrome/locale/et/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index ba257d3..4e7db0f 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -17,8 +17,8 @@
 <!ENTITY torbutton.prefs.proxy.port "Portua:">
 <!ENTITY torbutton.about.title "Torbuttoni buruz">
 <!ENTITY torbutton.about.version "Bertsioa:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.summary "Zure Tor nabigazioaren pribatutasuna babesten du.">
+<!ENTITY torbutton.about.code "Kode Laguntzaileak:">
 <!ENTITY torbutton.about.maintainer "Mantentzailea:">
 <!ENTITY torbutton.about.security_review "Segurtasun Berrikuspena">
 <!ENTITY torbutton.about.donate "Tor erabiltzea gustoko baduzu, agian">
@@ -26,7 +26,7 @@
 <!ENTITY torbutton.pref_connection.notice "Torbutton ezgaitu ezarpen hauek aldatzeko">
 <!ENTITY torbutton.pref_connection.more_info "Informazio gehiago">
 <!ENTITY torbutton.pref_connection_more_info.title "Laguntza">
-<!ENTITY torbutton.pref_connection_more_info.text "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.pref_connection_more_info.text "Une honetan Torbutton gaituta dago. Zure ez-Tor proxy ezarpenak aldatu nahi badituzu, mesedez ezgaitu Torbutton eta hona bueltatu. Zure Tor ezarpenak aldatu nahi badituzu, mesedez erabili Torbutton ezarpen leihoa.">
 <!ENTITY torbutton.context_menu.new_identity "Nortasun berria">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.toggle "Aldatu Toren egoera">
@@ -35,7 +35,7 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Torbuttoni buruz...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Babesa">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Babesak">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Kopiatu Tor URLa">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -57,56 +57,56 @@
 <!ENTITY torbutton.prefs.cookie_protection "Erabili Cookie Babes Elkarrizketa-koadroa aukeratzeko">
 <!ENTITY torbutton.prefs.mmm_cookies "Eskuz kudeatuko ditut nire cookieak (arriskutsua)">
 <!ENTITY torbutton.prefs.clear_cookies "Garbitu cookieak Tor aldatzerakoan">
-<!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.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.disable_plugins "Pluginak ezgaitu Tor erabiltzen den bitartean (erabakigarria)">
+<!ENTITY torbutton.prefs.kill_bad_js "Javascript arriskutsua lotu (erabakigarria)">
+<!ENTITY torbutton.prefs.isolate_content "Eduki dinamikoa Tor egoerara isolatu (erabakigarria)">
+<!ENTITY torbutton.prefs.no_updates "Ezgaitu eguneraketak Tor erabiltzen den bitartean">
+<!ENTITY torbutton.prefs.set_uagent "Ezarri erabiltzaile agentea Tor erabilerarentzako (erabakigarria)">
+<!ENTITY torbutton.prefs.dynamic "Eduki Dinamikoa">
+<!ENTITY torbutton.prefs.cookies "Cookieak">
+<!ENTITY torbutton.prefs.cache "Katxea">
+<!ENTITY torbutton.prefs.history "Historia">
+<!ENTITY torbutton.prefs.no_search "Ezgaitu bilaketa iradokizunak Tor bitartean (gomendatua)">
+<!ENTITY torbutton.prefs.shutdown "Itzali">
+<!ENTITY torbutton.prefs.tor_shutdown "Garbitu Tor cookieak Tor-gaitutako nabigatzaile bat itzali bitartean">
+<!ENTITY torbutton.prefs.all_shutdown "Garbitu cookieak edozein nabigatzaile itzaltzerakoan">
+<!ENTITY torbutton.prefs.no_shutdown "Ez garbitu nire cookieak itzaltzerakoan">
+<!ENTITY torbutton.prefs.disable_sessionstore "Ezagitu Saioa Gordetzea (gomendatua)">
+<!ENTITY torbutton.prefs.headers "Goiburuak">
+<!ENTITY torbutton.prefs.spoof_english "AEB Ingelera Nabigatzailea balitz ordeztu">
+<!ENTITY torbutton.prefs.refererspoofing "Refereraren nortasuna ordeztu">
 <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.smartspoof "Adimentsuki ordeztu referera Tor erabiltzen den bitartean (zeharkako domeinu refererak ordezten ditu)">
 <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!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.disable_domstorage "Ezgaitu DOM Biltegiratzea Tor erabili bitartean (erabakigarria)">
+<!ENTITY torbutton.prefs.forms "Inprimakiak">
+<!ENTITY torbutton.prefs.block_tforms "Blokeatu pasahitz+inprimaki gordetzea Tor erabili bitartean (gomendatua)">
+<!ENTITY torbutton.prefs.block_ntforms "Blokeatu pasahitz+inprimaki gordetzea Ez-Tor bitartean (gomendatua)">
 <!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.startup_tor "On browser 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 "Ez-Tor">
+<!ENTITY torbutton.prefs.restore_tor "Leheneratutako saio abioan, ezarri Tor egoera honetara:">
+<!ENTITY torbutton.prefs.startup_tor "Nabigatzaile abioan, ezarri Tor egoera honetara:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Birkargatu cookie pitxerra/garbitu cookieak Firefoxek talka egiterakoan (gomendatua)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Gorde bai Tor bai Ez-Tor cookieak babestutako pitxerretan (arriskutsua)">
+<!ENTITY torbutton.prefs.clear_http_auth "Garbitu HTTP benekotasun saioak (gomendatutakoa)">
+<!ENTITY torbutton.prefs.block_js_history "Historia nabigaziora sartzea Tor piztuta dagoen bitartean soilik isolatu (erabakigarria)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Leihoak 50pxko hainbatera eraldatu Tor erabili bitartean (gomendatua)">
+<!ENTITY torbutton.prefs.close_tor "Itxi Tor leiho eta fitxa guztiak egoera aldatzerakoan (hautazkoa)">
+<!ENTITY torbutton.prefs.close_nontor "Itxi Ez-Tor leiho eta fitxa guztiak egoera aldatzerakoan (hautazkoa)">
+<!ENTITY torbutton.prefs.block_links "Blokeatu lotura klikak eta orri birkargatzeak Tor egoera ezberdinetatik (hautazkoa)">
+<!ENTITY torbutton.prefs.jar_certs "Gorde SSL ziurtagiriak pitxer ezberdinetan Tor/Ez-Torentzat (gomendatua)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Gorde CA ziurtagiriak pitxer ezberdinetan Tor/Ez-Torentzat (gomendatua)">
+<!ENTITY torbutton.prefs.locked_mode "Ezgaitu Botoia eta Laster-teklak nahigabeko egoera aldaketa sahiesteko">
+<!ENTITY torbutton.prefs.startup_state "Abio arruntean, ezarri Tor egoera honetara:">
+<!ENTITY torbutton.prefs.shutdown_state "Itzaltze egoera">
+<!ENTITY torbutton.prefs.startup "Abioa">
+<!ENTITY torbutton.prefs.block_tor_file_net 'Blokeatu Torek "file://" URLetatik sarera sartzea (gomendatua)'>
+<!ENTITY torbutton.prefs.block_nontor_file_net 'Blokeatu Ez-Torek "file://" URLetatik sarera sartzea'>
+<!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri">
+<!ENTITY torbutton.prefs.test_settings "Ezarpenak frogatu">
+<!ENTITY torbutton.prefs.test_auto "Frogatu nire Tor ezarpenak egoeraz aldatzen dudan lehen aldian Firefox abio bakoitzean">
 <!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.tor_memory_jar "Ez idatzi Tor cookieak diskara">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Ez idatzi Ez-Tor cookieak diskan">
 <!ENTITY torbutton.prefs.session_restore "Saioa gorde eta fitxa hauek leheneratu:">
 <!ENTITY torbutton.prefs.nontor_tabs "Fitxak Ez-Toren kargatuak">
@@ -115,13 +115,13 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Proxyrik ez hauentzako:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Kontuz: Ez erabili ostalari-izenik gainean">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.prefs.spoofreresh "Ordezketa Freskatu">
+<!ENTITY torbutton.prefs.refereroptions "Referer Ordezketa Ezarpenak">
+<!ENTITY torbutton.prefs.nospoof "Referera ez ordeztu">
+<!ENTITY torbutton.prefs.spoofroot "Ordeztu orriaren eduki karpeta">
+<!ENTITY torbutton.prefs.spoofdomain "Ordeztu domeinua referera bezala">
+<!ENTITY torbutton.prefs.spoofblank "Referera zuri bihurtu">
+<!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu">
 <!ENTITY torbutton.cookiedialog.lockCol "Babestuta">
 <!ENTITY torbutton.cookiedialog.domainCol "Ostalaria">
 <!ENTITY torbutton.cookiedialog.nameCol "Izena">
@@ -132,16 +132,16 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Denak kendu babestutakoak izan ezik">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Cookie berriak babestu">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ez babestu cookie berririk">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.disable_livemarks "Ezgaitu Bizi-marka eguneraketak Tor erabili bitartean">
 <!ENTITY torbutton.prefs.dtd_recommended "(gomendatua)">
 <!ENTITY torbutton.prefs.dtd_optional "(hautazkoa)">
 <!ENTITY torbutton.prefs.dtd_crucial "(erabakigarria)">
-<!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.update_torbutton_via_tor "Torbutton eguneraketan Tor zehar birzuzendu">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatikoki beste bilaketa motor bat erabili Google Captcha batekin aurkezten denean:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.fix_google_srch "Kendu plataforma eta hizkuntza Google Searh Box eskaeretatik">
+<!ENTITY torbutton.prefs.transparentTor "Torifikazio Gardena (transproxy pertsonalizatua edo Tor routerra behar du)">
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index b1f93a9..581d6ee 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -7,36 +7,39 @@ torbutton.panel.plugins.enabled = Sakatu gehigarriak ezgaitzeko
 torbutton.panel.label.disabled = Tor Ezgaitua
 torbutton.panel.label.enabled = Tor Gaitua
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton botoi bat ematen du Firefoxek Tor proxyra seinalatzea erraz gaitu edo ezgaitzeko.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was 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.history.warning = Torbuttonek Tor egoera ezberdinean kargatutako fitxa bateko jarduera blokeatu du.\n\nHau 409737 eta 417869 Firefox Bugsen inguruko lana da.\n\nAzaleratze hau arrazoirik gabe agertu dela baldin badirudi, zure fitxetakoren bat atzeko planoan bere burua birkargatzen saiatzen ari da, eta hau blokeatu da.\n\nFitxa Tor egoera honetan birkargatzeko, sakatu 'intro' URL kokaleku kutxan.\n
+torbutton.popup.plugin.warning = Torbuttonek gehigarri edukien Tor karga zuzena blokeatu du.\n\nErabili Gorde-honela bere ordez.\n\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Oharra: Pertsonalizatutako Ziurtagiri Aginpiderik ez duzula ematen du. Ziurtagiri Aginpide zerrenda aztertzea eragiketa motela da eta Tor egoera aldaketa moteltzen du. Ziurtagiri Aginpideen ziurtagirien isolamendua ezgaitzea nahiko al zenuke? (Hau ulertzen ez baduzu, Ados sakatzea segurua da)
+torbutton.popup.ff3.warning = Oharra!\n\nEzaguna da Firefox 3n Torbuttonek zure denbora-gunea eta bizi-markak Tor bidez jakinarazten dituela.\n\nJarraitu nahi al duzu hala ere?
+torbutton.popup.toggle.warning = Toren egoera aldatu edo berrabiarazi behar duzu zure ezarpenek eragina izan dezaten.
 torbutton.popup.test.success = Tor proxy froga arrakastatsua!
 torbutton.popup.test.failure = Tor proxy frogak HUTS EGIN DU! Egiaztatu zure proxy eta Polipo ezarpenak.
-torbutton.popup.test.confirm_toggle = 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.popup.test.confirm_toggle = Azken Tor proxy frogak huts egin du Tor erabiltzerakoan.\n\nZiur al zaude hala ere gaitu nahi duzulaz?\n\nOharra: Arazoa konpondu baduzu, froga berriz exekuta dezakezu Torbutton Proxy Ezarpenak leihoan abisu hau ezabatzeko.
+torbutton.popup.test.ff3_notice = Sakatu Ados Tor proxy ezarpenak frogatzeko. Froga hau atzeko planoan gertatuko da. Mesedez pazientzia izan.
 torbutton.panel.label.verified = Tor Egiaztatua
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.popup.test.auto_failed = Tor proxy froga automatikoak huts egin du Tor erabiltzerakoan.\n\nZiur al zaude hala ere gaitu nahi duzulaz?
 torbutton.prefs.recommended = (gomendatua)
 torbutton.prefs.optional = (hautazkoa)
 torbutton.prefs.crucial = (erabakigarria)
 torbutton.popup.external.title = Kanpoko edukia kargatu?
 torbutton.popup.external.app = Kanpoko aplikazio bat behar da hurrengorako:\n\n
 torbutton.popup.external.note = \n\nOHARRA: Kanpoko aplikazioak EZ dira beti seguruak!\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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nFitxategi hau ziurtatu gabe badago, lineaz kanpo edo VM batean ikusteko gorde beharko zenuke,\nedo Tails LiveCD edo torsocks bezalako Tor proxy garden bat erabiltzea kontutan hartu.\n
 torbutton.popup.launch = Aplikazioa exekutatu
 torbutton.popup.cancel = Utzi
 torbutton.popup.dontask = Beti exekutatu aplikazioak hemendik aurrera
 torbutton.popup.test.no_http_proxy = Tor proxy froga: Ezin da HTTP Proxy lokalera iritsi. Polipo zuzen exekutatzen ari da?
 torbutton.popup.captcha.title = Saihestu Googleren Captchak?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.ask = Torbuttonek Google Captcha dat detektatu du. Beste bilaketa motor batera birbideratua izan nahi al duzu eskakizun honetarako?
 torbutton.popup.captcha.always = Beti egin ekintza hau hemendik aurrera
 torbutton.popup.redirect = Birzuzendu
 torbutton.popup.no_redirect = Ez birzuzendu
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.prompted_language = Pribatutasun gehiago emateko, Torbuttonek webguneen Ingelerazko bertsioa eska dezake. Honek zure ama hizkuntzan irakurtzea nahiago izan ditzakezun orriak Ingeleraz agertzea ekar dezake.\n\nNahiko al zenuke webguneen Ingelerazko hizkuntza eskatu pribatutasun hobeagoa izateko?
+torbutton.popup.no_newnym = Torbuttonek ezin dizu modu seguruan nortasun berri bat eman. Ez du Tor Kontrol Portura nola sartzerik.\n\nTor Browser Bundle exekutatzen ari al zara?
+torbutton.popup.use_tbb = Badirudi Torbutton Firefoxekin erabiltzen ari zarela, gehiago gomendatzen ez den segurtasun konfigurazioa izanik.\n\nHorren ordez, azkenengo Tor Browser Bundlea eskura dezazun gomendatzen dizugu, bai gettor@xxxxxxxxxxxxxxxxxx email bat bidaliz bai hurrengo URLetik jaitsiz:
+torbutton.popup.pref_error = Torbuttonek ezin ditu Tor Browser profilaren direktorioan hobespenak eguneratu.
+torbutton.popup.permission_denied = Mesedez berrezarri Tor Browser direktorioaren baimenak edo kopia ezazu beste kokaleku batera.
 torbutton.popup.device_full = Diska beteta dago, antza. Mesedez egizu lekua edo mugitu Tor Nabigatzailea gailu berri batera.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index 21eefa4..75ddaf8 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = بÙ? Ù?ظر Ù?Û? رسد  Ø´Ù?ا در حاÙ? استÙ?ا
 torbutton.popup.pref_error = Torbutton  Ù?Ù?Û? تÙ?اÙ?Û?د تÙ?ظÛ?Ù?ات را در داÛ?رکتÙ?رÛ? Ù?شخصات Ù?رÙ?رگر Tor را بÙ? رÙ?ز رساÙ?Û? Ú©Ù?د
 torbutton.popup.permission_denied = Ù?Ø·Ù?ا Û?Ú©Û? از دÙ? تÙ?ظÛ?Ù? Ù?جدد Ù?جÙ?ز داÛ?رکتÙ?رÛ? Ù?رÙ?رگر Tor Ù? Û?ا Ú©Ù¾Û? Ø¢Ù? را بÙ? Û?Ú© Ù?کاÙ? جدÛ?د.
 torbutton.popup.device_full = دÛ?سک بÙ? Ù?ظر Ù?Û? رسد پر شدÙ? است. Ù?Ø·Ù?ا Ù?Ù?دارÛ? Ù?ضا خاÙ?Û? Ú©Ù?Û?د Û?ا تÙ?ر را بÙ? Ù?کاÙ? جدÛ?دÛ? اÙ?تÙ?اÙ? دÙ?Û?د.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index 14c2199..dda9d2d 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -7,7 +7,7 @@ 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 = Torbuttonin avulla Firefox saadaan helposti käyttämään tai poistamaan käytöstä Tor välityspalvelin 
-torbutton.popup.history.warning = Torbutton esti välilehden lataamisen joka oli avattu eri Tor-tilassa.\n\nKyseessä on Firefox Bug 409737 ja 417869.\n\nJos tämä näyttää tapahtuvan ilman syytä, jokin välilehdistä pyrkii lataamaan itsensä taustalla, ja se estettiin.\n\nLadataksesi välilehden tässä Tor-tilassa, laita kursori osoite riville (http://...) ja klikkaa 'enter'.\n\n
+torbutton.popup.history.warning = Torbutton esti välilehden lataamisen joka oli avattu eri Tor-tilassa.\n\nKyseessä on Firefox Bug 409737 ja 417869.\n\nJos tämä näyttää tapahtuvan ilman syytä, jokin välilehdistä pyrkii lataamaan itsensä taustalla, ja se estettiin.\n\nLadataksesi välilehden tässä Tor-tilassa, paina 'enteriä' selaimen osoiterivillä (navigointipalkissa).\n\n
 torbutton.popup.plugin.warning = Torbutton esti lisäosan lataamisen Tor-tilassa.\n\nKäytä Save-As toimintoa.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton huomautus: Vaikuttaa että sinulla ei ole itsemääriteltyä Sertifikaattien Tunnistusta. Sertifikaattien tarkistaminen on hidas prosessi ja hidastaa Tor- tilan vaihtamista. Haluaisitko poistaa tämän toiminnon käytöstä nopeuttaaksesi toimintaa? (Jos et tiedä mistä on kyse, voit turvallisesti klikata OK)
 torbutton.popup.ff3.warning = Varoitus!\n\nTorbuttonin käyttö Firefox 3:ssa saattaa paljastaa aikavyöhykkeesi ja muita tietoja Torrin kautta.\n\nHaluatko siitä huolimatta jatkaa?
@@ -16,27 +16,30 @@ torbutton.popup.test.success = Tor-välityspalvelimen testaus onnistui!
 torbutton.popup.test.failure = Tor-välityspalvelimen testaus EP�ONNISTUI! Tarkista välityspalvelimen ja Polipon asetukset.
 torbutton.popup.test.confirm_toggle = Viimeisin suoritettu Tor välityspalvelintesti epäonnistui.\n\nHaluatko siitä huolimatta kääntää Torin päälle?\n\nHuom: Jos olet korjannut ongelman, voit ajaa testin uudestaan käyttämällä Torbutton Proxy Preferences ikkunaa, niin et enää saa tätä varoitusta uudestaan.
 torbutton.popup.test.ff3_notice = Klikkaa OK testataksesi Tor välityspalvelinasetukset. Testi tapahtuu taustalla, odota rauhassa, ilmoitus annetaan kuin testi on valmis.
-torbutton.panel.label.verified = Tor varmistettu
-torbutton.popup.test.auto_failed = Automaattinen Tor välityspalvelimen testi epäonnistui käyttämään Toria.\nHaluatko aktivoida Torin jokatapauksessa?
+torbutton.panel.label.verified = Tor vahvistettu
+torbutton.popup.test.auto_failed = Automaattinen Tor välityspalvelimen testi ei onnistunut käyttämään Toria.\nHaluatko aktivoida Torin jokatapauksessa?
 torbutton.prefs.recommended = (suositeltu)
 torbutton.prefs.optional = (valinnainen)
 torbutton.prefs.crucial = (kriittinen)
 torbutton.popup.external.title = Ladataanko ulkopuolinen sisältö?
 torbutton.popup.external.app = Tarvitaan ulkoinen sovellus:\n\n
-torbutton.popup.external.note = \n\nHUOM: Ulkoiset sovellukset eivät ole oletusarvoisesti Tor turvallisia ja saattavat poistaa Tor suojauksesi!\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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.note = \nHUOM: Ulkoiset sovellukset eivät lähtökohtaisesti ole Tor turvallisia ja saattavat paljastaa identiteettisi!\n
+torbutton.popup.external.suggest = \nJos et luota tähän tiedostoon, on parasta tallentaa se ja avata se verkkoyhteyden katkaisemisen jälkeen tai virtuaalikoneessa.\nVaihtoehtoisesti voit harkita Tails LiveCD:n tai torsocksin tapaisen transparentin tor-proxyn käyttöä.\n
 torbutton.popup.launch = Käynnistä sovellus
 torbutton.popup.cancel = Peruuta
-torbutton.popup.dontask = Käynistä sovellus joka kerta tästä eteenpäin
+torbutton.popup.dontask = Jatkossa käynnistä aina sovellukset
 torbutton.popup.test.no_http_proxy = Tor välityspalvelintesti: Paikallista HTTP välityspalvelinta ei löydy. Onko polipo käynnissä?
-torbutton.popup.captcha.title = Vältä Google Captchas?
+torbutton.popup.captcha.title = Vältä Google Captchat?
 torbutton.popup.captcha.ask = Torbutton havaitsi Google Captchan. Haluatko että tämä kysely uudelleenohjataan toiselle hakukoneelle?
 torbutton.popup.captcha.always = Suorita tämä toimenpide joka kerta tästä eteenpäin
 torbutton.popup.redirect = Uudelleenohjaa
-torbutton.popup.no_redirect = �lä Uudelleenohjaa
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.no_redirect = �lä uudelleenohjaa
+torbutton.popup.prompted_language = Yksityisyytesi lisäämiseksi Torbutton voi pyytää webbisivuista englanninkielisen version. Tämä saattaa aiheuttaa sen, että webbisivut, jotka luet mieluiten äidinkielelläsi, näytetään englanniksi.\n\nHaluatko pyytää webbisivut englanniksi yksityisyyden lisäämiseksi?
+torbutton.popup.no_newnym = Torbutton ei voi taata sinulle turvallisesti uutta identiteettiä. Sillä ei ole pääsyä Tor-hallintaporttiin.\n\nOnko Tor Browser Bundle käytössä?
+torbutton.popup.use_tbb = Näyttää siltä, että käytät Torbuttonia Firefoxin kanssa, mitä ei enää suositella turvallisena yhdistelmänä.\n\nSen sijaan suosittelemme, että hankit uusimman Tor Browser Bundlen lähettämällä sähköpostin osoitteeseen gettor@xxxxxxxxxxxxxx tai lataamalla sen osoitteesta:
+torbutton.popup.pref_error = Torbutton ei voi päivittää asetuksia Tor Browserin profiilihakemistossa.
+torbutton.popup.permission_denied = Aseta Tor Browserin hakemiston käyttöoikeudet uusiksi tai kopioi se uuteen sijaintiin.
+torbutton.popup.device_full = Levy näyttäisi olevan täysi. Vapauta tilaa tai siirrä Tor Browser uudelle laitteelle.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/fil/torbutton.dtd
+++ b/src/chrome/locale/fil/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/fil/torbutton.properties b/src/chrome/locale/fil/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/fil/torbutton.properties
+++ b/src/chrome/locale/fil/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/fo/torbutton.dtd
+++ b/src/chrome/locale/fo/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/fo/torbutton.properties b/src/chrome/locale/fo/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/fo/torbutton.properties
+++ b/src/chrome/locale/fo/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 0e571bf..759de19 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = Il semble que vous utilisez Torbutton avec Firefox, ce
 torbutton.popup.pref_error = Torbutton ne peut pas mettre à jour les préférences dans le répertoire du profil du Navigateur Tor.
 torbutton.popup.permission_denied = Merci de réinitialiser les permissions du répertoire du Navigateur Tor  ou de le copier dans un nouvel emplacement.
 torbutton.popup.device_full = Le disque semble être plein. Merci de libérer de la place ou déplacer le Navigateur Tor vers un nouveau périphérique. 
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/fur/torbutton.properties b/src/chrome/locale/fur/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/fur/torbutton.properties
+++ b/src/chrome/locale/fur/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/fy/torbutton.dtd
+++ b/src/chrome/locale/fy/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/fy/torbutton.properties b/src/chrome/locale/fy/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/fy/torbutton.properties
+++ b/src/chrome/locale/fy/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ga/torbutton.properties
+++ b/src/chrome/locale/ga/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/gl/torbutton.properties b/src/chrome/locale/gl/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/gl/torbutton.properties
+++ b/src/chrome/locale/gl/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/gu/torbutton.properties b/src/chrome/locale/gu/torbutton.properties
index d5422e7..be2f34c 100644
--- a/src/chrome/locale/gu/torbutton.properties
+++ b/src/chrome/locale/gu/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/gun/torbutton.dtd
+++ b/src/chrome/locale/gun/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/gun/torbutton.properties b/src/chrome/locale/gun/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/gun/torbutton.properties
+++ b/src/chrome/locale/gun/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ha/torbutton.dtd
+++ b/src/chrome/locale/ha/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ha/torbutton.properties b/src/chrome/locale/ha/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ha/torbutton.properties
+++ b/src/chrome/locale/ha/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 8ebcb89..f002b19 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -2,20 +2,20 @@
 <!ENTITY torbutton.prefs.display_settings "×?צ×? ×?×?×?ר×?ת">
 <!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
 <!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.panel_text_format "×?קס×?">
+<!ENTITY torbutton.prefs.panel_icon_format "×?×?×?ק×?×?">
+<!ENTITY torbutton.prefs.tor_settings "×?×?×?ר×?ת פר×?קס×?">
+<!ENTITY torbutton.prefs.recommended_settings '×?שת×?ש ×?×?×?×?ר×?ת פר×?קס×? ×?×?×?×?צ×?ת ×¢×?×?ר ×?רס×?ת ×?"פ×?×?רפ×?קס" ש×?×?'>
+<!ENTITY torbutton.prefs.use_privoxy "×?שת×?ש ×?פר×?×?×?קס×?">
+<!ENTITY torbutton.prefs.use_polipo "×?שת×?ש ×?פ×?×?×?פ×?">
+<!ENTITY torbutton.prefs.custom_settings "×?שת×?ש ×?×?×?×?ר×?ת פר×?קס×? ×?×?×?×?ר×?ת ×?ר×?ש">
+<!ENTITY torbutton.prefs.proxy.host.http "פר×?קס×? HTTP:">
+<!ENTITY torbutton.prefs.proxy.host.https "פר×?קס×? SSL:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "פר×?קס×? FTP:">
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.prefs.proxy.port "פ×?ר×?:">
+<!ENTITY torbutton.about.title "×?×?×?×?ת ×?×?צ×? ×?×?ר">
 <!ENTITY torbutton.about.version "Version:">
 <!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
 <!ENTITY torbutton.about.code "Code Contributors:">
@@ -24,7 +24,7 @@
 <!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
 <!ENTITY torbutton.about.make_donation "making a donation.">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
+<!ENTITY torbutton.pref_connection.more_info "×?×?×?×¢ × ×?סף">
 <!ENTITY torbutton.pref_connection_more_info.title "Help">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
@@ -33,7 +33,7 @@
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferences...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about "×?×?×?×?ת ×?×?צ×? ×?×?ר...">
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
@@ -43,11 +43,11 @@
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
 <!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
-<!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.button.label "×?×?צ×? ×?×?ר">
+<!ENTITY torbutton.button.tooltip "×?×?×¥ ×?×?×?×? ×?×?ת×?×? ×?ת ×?×?צ×? ×?×?ר">
+<!ENTITY torbutton.prefs.sec_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_thwrite "×?ס×?×? ×?ת×?×?×?ת ×?×?×?ס×?×?ר×?×? ×?×?×?×? ×?רצת ×?×?ר (×?×?×?×?×¥)">
 <!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)">
@@ -63,11 +63,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 "×¢×?×?×?×?ת">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.history "×?×?ס×?×?ר×?×?">
 <!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.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">
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index 60c4a3a..ff436e4 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = נר×?×? ש×?ת×? ×?שת×?ש ×?-Torbutton ×¢×? פ×?×?
 torbutton.popup.pref_error = Torbutton ×?×?× ×? ×?×?×?×? ×?×¢×?×?×? ×?ת ×?×?×¢×?פ×?ת ×?ת×?ק×?ת ×?פר×?פ×?×?.
 torbutton.popup.permission_denied = ×?× ×? ק×?×¢ ×?רש×?×?ת ×?×?ש×?ת ×?ת×?ק×?×?×? ×?×? × ×?צ×? ×?פ×?פ×? Tor ×?×? ×?עתק ×?×?ת×? ×?×?×?ק×?×? ×?×?ש.
 torbutton.popup.device_full = ×?×?×?סק נר×?×? ×?×?×? ש×?×? ×?×?ס×?×? פנ×?×?. ×?× ×? פנ×? ×?ק×?×? ×?×? ×?×¢×?ר ×?ת ×?פ×?פ×? Tor ×?×?×?ק×?×? ×?×?ש.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index db64f0e..08663f6 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/hi/torbutton.properties b/src/chrome/locale/hi/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/hi/torbutton.properties
+++ b/src/chrome/locale/hi/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index fe5504a..98abd36 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -1,13 +1,13 @@
-<!ENTITY torbutton.prefs.title "Torbutton Postavke">
+<!ENTITY torbutton.prefs.title "Torbutton postavke">
 <!ENTITY torbutton.prefs.display_settings "Prikaži postavke">
 <!ENTITY torbutton.prefs.display_panel "Prikaži Tor proxy postavke u statusnoj traci">
 <!ENTITY torbutton.prefs.panel_format "Oblik prikazivanja u statusnoj traci:">
 <!ENTITY torbutton.prefs.panel_text_format "Tekst">
 <!ENTITY torbutton.prefs.panel_icon_format "Ikona">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Postavke">
+<!ENTITY torbutton.prefs.tor_settings "Proxy postavke">
 <!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄ?ene proxy postavke za moju inaÄ?icu Firefoxa">
 <!ENTITY torbutton.prefs.use_privoxy "Koristi Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Koristi Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Koristi prilagoÄ?ene proxy postavke">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
@@ -15,7 +15,7 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS domaÄ?in:">
 <!ENTITY torbutton.prefs.proxy.port "PrikljuÄ?ak:">
-<!ENTITY torbutton.about.title "O Torbutton">
+<!ENTITY torbutton.about.title "O Torbuttonu">
 <!ENTITY torbutton.about.version "Version:">
 <!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
 <!ENTITY torbutton.about.code "Code Contributors:">
@@ -23,34 +23,34 @@
 <!ENTITY torbutton.about.security_review "Security Review:">
 <!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
 <!ENTITY torbutton.about.make_donation "making a donation.">
-<!ENTITY torbutton.pref_connection.notice "OnemoguÄ?ite Torbutton da biste promijenili ove postavke">
+<!ENTITY torbutton.pref_connection.notice "OnemoguÄ?ite Torbutton da biste promijenili ove postavke.">
 <!ENTITY torbutton.pref_connection.more_info "Više informacija">
 <!ENTITY torbutton.pref_connection_more_info.title "PomoÄ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je trenutno omoguÄ?en. Ako biste željeli promijeniti VaÅ¡e ne-Tor proxy postavke, molimo Vas da onemoguÄ?ite Torbutton i vratite se ovdje. Ako biste željeli promijeniti VaÅ¡e Tor postavke, molimo Vas, koristite prozor Torbutton postavki.">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je trenutno omoguÄ?en. Ukoliko želite promijeniti VaÅ¡e ne-Tor proxy postavke, molimo Vas da onemoguÄ?ite Torbutton i vratite se ovdje. Ukoliko želite promijeniti VaÅ¡e Tor postavke, molimo Vas, koristite prozor Torbutton postavki.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.toggle "Promijeni Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "r">
+<!ENTITY torbutton.context_menu.toggle.key "P">
 <!ENTITY torbutton.context_menu.preferences "Postavke...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "O Torbutton...">
+<!ENTITY torbutton.context_menu.preferences.key "p">
+<!ENTITY torbutton.context_menu.about "O Torbuttonu...">
 <!ENTITY torbutton.context_menu.about.key "O">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
-<!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tite kolaÄ?iÄ?a">
+<!ENTITY torbutton.context_menu.cookieProtections.key "Z">
+<!ENTITY torbutton.context_menu.copyTor "Kopiraj Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "k">
+<!ENTITY torbutton.context_menu.openTorTab "Otvori Tor URL u novoj kartici">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "Otvori Tor URL u novom prozoru">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Kliknite da biste pokrenuli 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.button.tooltip "Kliknite za pokretanje Torbuttona">
+<!ENTITY torbutton.prefs.sec_settings "Sigurnosne postavke">
+<!ENTITY torbutton.prefs.block_thread "Zabrani Ä?itanje povijesti kad je Tor omoguÄ?en (kljuÄ?no)">
+<!ENTITY torbutton.prefs.block_thwrite "Zabrani zapisivanje povijesti kad je Tor omoguÄ?en (preporuÄ?eno)">
+<!ENTITY torbutton.prefs.block_nthread "Zabrani Ä?itanje povijesti kad Tor nije omoguÄ?en (opcionalno)">
+<!ENTITY torbutton.prefs.block_nthwrite "Zabrani zapisivanje povijesti kad Tor nije omoguÄ?en (opcionalno)">
+<!ENTITY torbutton.prefs.clear_history "Obriši povijest kod promjene Tor statusa (opcionalno)">
 <!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">
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/hr/torbutton.properties b/src/chrome/locale/hr/torbutton.properties
index 8215fd7..53e081a 100644
--- a/src/chrome/locale/hr/torbutton.properties
+++ b/src/chrome/locale/hr/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ht/torbutton.dtd
+++ b/src/chrome/locale/ht/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ht/torbutton.properties b/src/chrome/locale/ht/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ht/torbutton.properties
+++ b/src/chrome/locale/ht/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties
index a2c207b..f0ed90f 100644
--- a/src/chrome/locale/hu/torbutton.properties
+++ b/src/chrome/locale/hu/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = �gy tűnik, hogy jelenleg Torbutton-t használ Firefo
 torbutton.popup.pref_error = A Torbutton nem tudja frissíteni a beállításokat a Tor böngészÅ? profil könyvtárában.
 torbutton.popup.permission_denied = Kérjük, vagy állítsa vissza a jogosultságokat a Tor Browser könyvtárhoz, vagy másolja azt egy új helyre.
 torbutton.popup.device_full = �gy tűnik, hogy a lemez megtelt. Kérjük, szabadítson fel helyet, vagy helyezze át a Tor Browser-t egy másik háttértárolóra.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/hy/torbutton.dtd
+++ b/src/chrome/locale/hy/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/hy/torbutton.properties b/src/chrome/locale/hy/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/hy/torbutton.properties
+++ b/src/chrome/locale/hy/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index 3e3bbc7..1c4dbc6 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index 87d6115..ba5b9d1 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = Sembra che si stia usando Torbutton con Firefox, modal
 torbutton.popup.pref_error = Torbutton non può aggiornare le preferenze nella pannello profilo del Tor Browser.
 torbutton.popup.permission_denied = Si prega di reimpostare i permessi della cartella Tor Browser oppure di spostarla altrove.
 torbutton.popup.device_full = Sembra che il disco sia pieno. Liberare spazio o spostare Tor Browser in un altro dispositivo.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index fcf5106..1a146d0 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index 7f60271..e98759b 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -1,42 +1,45 @@
 torbutton.button.tooltip.disabled = Torã??æ??å?¹ã?«ã??ã??
 torbutton.button.tooltip.enabled = Torã??ç?¡å?¹ã?«ã??ã??
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.tooltip.disabled = ã?¯ã?ªã??ã?¯ã??ã?¦Torã??æ??å?¹ã?«ã??ã??
+torbutton.panel.tooltip.enabled = ã?¯ã?ªã??ã?¯ã??ã?¦Torã??ç?¡å?¹ã?«ã??ã??
 torbutton.panel.plugins.disabled = ã??ã?©ã?°ã?¤ã?³ã??æ??å?¹ã?«ã??ã??
 torbutton.panel.plugins.enabled = ã??ã?©ã?°ã?¤ã?³ã??ç?¡å?¹ã?«ã??ã??
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbuttonã?¯Firefoxã??ã??ç°¡å??ã?«Torã??ã?­ã?¯ã?·ã??æ??å?¹å??ï¼?ç?¡å?¹å??ã?§ã??ã?¾ã??ã??
+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 activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was 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.plugin.warning = Torbuttonã?¯ã??ã?©ã?°ã?¤ã?³ã??å?©ç?¨ã??ã??ã?³ã?³ã??ã?³ã??ã??ç?´æ?¥èª­ã?¿è¾¼ã?¾ã??ã??ã??ã?¨ã??ã??ã?­ã??ã?¯ã??ã?¾ã??ã??ã??\n\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ã??ã?­ã?¯ã?·ã?®ã??ã?¹ã??ã?«æ??å??ã??ã?¾ã??ã??!
-torbutton.popup.test.failure = Torã??ã?­ã?¯ã?·ã?®ã??ã?¹ã??ã?«å¤±æ??ã??ã?¾ã??ã??! ã??ã?­ã?¯ã?·ã?¨Polipoã?®è¨­å®?ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??
+torbutton.popup.ff3.warning = è­¦å??\n\nFirefox 3ä¸?ã?§Torbuttonã??使ç?¨ã??ã??ã?¨ã??ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??ã?©ã?¤ã??ã??ã??ã?¯ã??ã?¼ã?¯ã?®æ??å ±ã??Torã??é??ã??ã?¦æ¼?æ´©ã??ã??æ??ã??ã??ã??ã??ã?¾ã??ã??\n\nå?©ç?¨ã??ç¶?ç¶?ã??ã?¾ã??ã??ï¼?
+torbutton.popup.toggle.warning = 設å®?ã?®å¤?æ?´ã??å??æ? ã??ã??ã??ã??ã??ã?«ã??å??æ??å?¹å??ã??ã??ã??Torã??å??èµ·å??ã??ã?¦ã??ã? ã??ã??ã??
+torbutton.popup.test.success = Torã??ã?­ã?¯ã?·ã?®ã??ã?¹ã??ã?«æ??å??ã??ã?¾ã??ã??
+torbutton.popup.test.failure = Torã??ã?­ã?¯ã?·ã?®ã??ã?¹ã??ã?«å¤±æ??ã??ã?¾ã??ã??ã?? ã??ã?­ã?¯ã?·ã?¨Polipoã?®è¨­å®?ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??
 torbutton.popup.test.confirm_toggle = 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.popup.test.ff3_notice = Torã?®ã??ã?­ã?­ã?·è¨­å®?ã??ã??ã?¹ã??ã??ã??ã?«ã?¯OKã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??ã??ã?®ã??ã?¹ã??ã?¯ã??ã??ã?¯ã?°ã?©ã?¦ã?³ã??ã?§å®?è¡?ã??ã??ã?¾ã??ã?®ã?§ã??ã??ã?°ã??ã??ã??å¾?ã?¡ã??ã? ã??ã??ã??
+torbutton.panel.label.verified = Tor 確���
+torbutton.popup.test.auto_failed = Torã??使ç?¨ã??ã??ã??ã??ã?®è?ªå??Torã??ã?­ã?­ã?·ã??ã?¹ã??ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n\nå¼·å?¶ç??ã?«æ??å?¹å??ã??ã?¾ã??ã??ï¼?
 torbutton.prefs.recommended = (�奨)
 torbutton.prefs.optional = (ã?ªã??ã?·ã?§ã?³)
 torbutton.prefs.crucial = (é??è¦?)
-torbutton.popup.external.title = 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.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 Tails LiveCD or torsocks.\n
 torbutton.popup.launch = ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³èµ·å??
 torbutton.popup.cancel = �����
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.dontask = ä»?å¾?ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??ã??ã?¤ã??èµ·å??ã??ã??
+torbutton.popup.test.no_http_proxy = Torã??ã?­ã?­ã?·ã??ã?¹ã??: ã?­ã?¼ã?«ã?«HTTPã??ã?­ã?­ã?·ã?«å?°é??ã?§ã??ã?¾ã??ã??ã??Polipoã?¯æ­£å¸¸ã?«å??ä½?ã??ã?¦ã??ã?¾ã??ã??ï¼?
+torbutton.popup.captcha.title = Google CAPTCHAã??å??é?¿ã??ã?¾ã??ã??ï¼?
+torbutton.popup.captcha.ask = Torbuttonã?¯Google CAPTCHAã??æ¤?å?ºã??ã?¾ã??ã??ã??ã??ã?®ã?¯ã?¨ã?ªã??å?¥ã?®æ¤?ç´¢ã?¨ã?³ã?¸ã?³ã?§å®?è¡?ã??ã?¾ã??ã??ï¼?
+torbutton.popup.captcha.always = ä»?å¾?ã??ã?®ã?¢ã?¯ã?·ã?§ã?³ã??ã??ã?¤ã??å®?è¡?ã??ã??
+torbutton.popup.redirect = ã?ªã??ã?¤ã?¬ã?¯ã??ã??ã??
+torbutton.popup.no_redirect = ã?ªã??ã?¤ã?¬ã?¯ã??ã??ã?ªã??
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.no_newnym = Torã?³ã?³ã??ã?­ã?¼ã?«ã??ã?¼ã??ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??Torbuttonã?¯æ?°ã??ã??æ?¥ç¶?çµ?è·¯ã??å®?å?¨ã?«ç?¨æ??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã??\n\nTorã??ã?©ã?¦ã?¶ã??ã?³ã??ã?«ã??èµ·å??ã??ã?¦ã??ã?¾ã??ã??ï¼?
 torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.pref_error = Torbuttonã?¯ã??ã?­ã??ã?¡ã?¤ã?«ã??ã?£ã?¬ã?¯ã??ã?ªã?«ã??ã??設å®?ã??ã?¢ã??ã??ã??ã?¼ã??ã?§ã??ã?¾ã??ã??ã??
+torbutton.popup.permission_denied = Torã??ã?©ã?¦ã?¶ã??ã?£ã?¬ã?¯ã??ã?ªã?®ã??ã?¼ã??ã??ã?·ã?§ã?³ã??ã?ªã?»ã??ã??ã??ã??ã??ã??æ?°ã??ã?ªå ´æ??ã?«ã?³ã??ã?¼ã??ã?¦ã??ã? ã??ã??ã??
+torbutton.popup.device_full = è¨?æ?¶è£?ç½®ã?®ç©ºã??容é??ã??ä¸?足ã??ã?¦ã??ã??ã??ã??ã?§ã??ã??空ã??容é??ã??å¢?ã??ã??ã??ã??Torã??ã?©ã?¦ã?¶ã??æ?°ã??ã?ªè¨?æ?¶è£?ç½®ã?¸ç§»å??ã??ã?¦ã??ã? ã??ã??ã??
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/jv/torbutton.dtd
+++ b/src/chrome/locale/jv/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/jv/torbutton.properties b/src/chrome/locale/jv/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/jv/torbutton.properties
+++ b/src/chrome/locale/jv/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ka/torbutton.properties
+++ b/src/chrome/locale/ka/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/km/torbutton.properties b/src/chrome/locale/km/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/km/torbutton.properties
+++ b/src/chrome/locale/km/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/kn/torbutton.dtd
+++ b/src/chrome/locale/kn/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/kn/torbutton.properties b/src/chrome/locale/kn/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/kn/torbutton.properties
+++ b/src/chrome/locale/kn/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ku/torbutton.properties b/src/chrome/locale/ku/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ku/torbutton.properties
+++ b/src/chrome/locale/ku/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/kw/torbutton.dtd
+++ b/src/chrome/locale/kw/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/kw/torbutton.properties b/src/chrome/locale/kw/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/kw/torbutton.properties
+++ b/src/chrome/locale/kw/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ky/torbutton.dtd
+++ b/src/chrome/locale/ky/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ky/torbutton.properties b/src/chrome/locale/ky/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ky/torbutton.properties
+++ b/src/chrome/locale/ky/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/lb/torbutton.dtd
+++ b/src/chrome/locale/lb/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/lb/torbutton.properties b/src/chrome/locale/lb/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/lb/torbutton.properties
+++ b/src/chrome/locale/lb/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ln/torbutton.dtd
+++ b/src/chrome/locale/ln/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ln/torbutton.properties b/src/chrome/locale/ln/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ln/torbutton.properties
+++ b/src/chrome/locale/ln/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/lo/torbutton.dtd
+++ b/src/chrome/locale/lo/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/lo/torbutton.properties b/src/chrome/locale/lo/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/lo/torbutton.properties
+++ b/src/chrome/locale/lo/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/lt/torbutton.dtd
+++ b/src/chrome/locale/lt/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/lt/torbutton.properties b/src/chrome/locale/lt/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/lt/torbutton.properties
+++ b/src/chrome/locale/lt/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/lv/torbutton.dtd
+++ b/src/chrome/locale/lv/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/lv/torbutton.properties b/src/chrome/locale/lv/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/lv/torbutton.properties
+++ b/src/chrome/locale/lv/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/mg/torbutton.dtd
+++ b/src/chrome/locale/mg/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/mg/torbutton.properties b/src/chrome/locale/mg/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/mg/torbutton.properties
+++ b/src/chrome/locale/mg/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/mi/torbutton.dtd
+++ b/src/chrome/locale/mi/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/mi/torbutton.properties b/src/chrome/locale/mi/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/mi/torbutton.properties
+++ b/src/chrome/locale/mi/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/mk/torbutton.dtd
+++ b/src/chrome/locale/mk/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/mk/torbutton.properties b/src/chrome/locale/mk/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/mk/torbutton.properties
+++ b/src/chrome/locale/mk/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ml/torbutton.dtd
+++ b/src/chrome/locale/ml/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ml/torbutton.properties b/src/chrome/locale/ml/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ml/torbutton.properties
+++ b/src/chrome/locale/ml/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/mn/torbutton.dtd
+++ b/src/chrome/locale/mn/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/mn/torbutton.properties b/src/chrome/locale/mn/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/mn/torbutton.properties
+++ b/src/chrome/locale/mn/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/mr/torbutton.dtd
+++ b/src/chrome/locale/mr/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/mr/torbutton.properties b/src/chrome/locale/mr/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/mr/torbutton.properties
+++ b/src/chrome/locale/mr/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ms/torbutton.dtd
+++ b/src/chrome/locale/ms/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ms/torbutton.properties b/src/chrome/locale/ms/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ms/torbutton.properties
+++ b/src/chrome/locale/ms/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/mt/torbutton.properties b/src/chrome/locale/mt/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/mt/torbutton.properties
+++ b/src/chrome/locale/mt/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd
index 2577761..771a432 100644
--- a/src/chrome/locale/my/torbutton.dtd
+++ b/src/chrome/locale/my/torbutton.dtd
@@ -1,147 +1,147 @@
-<!ENTITY torbutton.prefs.title "Tor Button á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸á??á??á??á?¹á?»á??á??á?ºá??á?¹á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.display_settings "á?»á??á??á??á??á?¹ á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.display_panel "Tor proxy á??á?ºá?­á??á?¹á??á??á?­á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ Status Bar á??á?¼á??á?¹ á?»á??á??á??á??á?¹">
-<!ENTITY torbutton.prefs.panel_format "Status bar á?»á??á??á??á?? á??á?¶á?¯á??á?¶">
+<!ENTITY torbutton.prefs.title "Torbutton á??á?­á?¯á??á?¬á?¸á??á?»á??á?ºá??á?»á?¬á?¸">
+<!ENTITY torbutton.prefs.display_settings "á?¡á??á?¯á??á?ºá??á?±á?¬á?ºá??á?¼á??á?¾á?¯á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸">
+<!ENTITY torbutton.prefs.display_panel "á?¡á??á?¼á?±á?¡á??á?±á??á?¼á??á?¬á?¸á??á??á?ºá?¸á?? Tor á??á??á?±á?¬á??á?·á?ºá??á?® á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á??á?±á?¬á?ºá??á?¼á??á?«á??">
+<!ENTITY torbutton.prefs.panel_format "á?¡á??á?¼á?±á?¡á??á?±á??á?¼ á??á?¬á?¸á??á??á?ºá?¸á?? á??á?±á?¬á?ºá??á?¼á??á??á?·á?º á??á?¯á?¶á??á?¶ -">
 <!ENTITY torbutton.prefs.panel_text_format "á??á?¬á??á?¬á?¸">
-<!ENTITY torbutton.prefs.panel_icon_format "á?¡á?­á?¯á??á?¹á??á?¼á??á?¹ á??á?¯á??á?¹á??á?¶á?¯">
-<!ENTITY torbutton.prefs.tor_settings "Proxy á??á?ºá?­á??á?¹á??á??á?­á??á?ºá??á?¹á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.recommended_settings "á?¡á?¾á??á?¶á?»á??á?³ á?±á??á?¬á??á?¹á??á?¶á?±á??á?¬ proxy á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?­á?? Firefox version á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.use_privoxy "Privoxy á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.use_polipo "Polipo á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.custom_settings "proxy á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á?¾á??á?­á?³á??á?¹á?»á??á?³á?»á??á??á?¹á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP á??á?±á??á?¬á?·á??á?® :">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL á??á?±á??á?¬á?·á??á?® :">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP á??á?±á??á?¬á?·á??á?® :">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher á??á?±á??á?¬á?·á??á?®">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host :">
-<!ENTITY torbutton.prefs.proxy.port "Port :">
-<!ENTITY torbutton.about.title "Torbutton á?¡á?±á?¾á??á?¬á??á?¹á?¸">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
-<!ENTITY torbutton.pref_connection.notice "á??á??á?¹á?¸á??á?ºá?­á??á?¹á??á??á?­á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹á?¡á??á?¼á??á?¹ Torbutton á??á?¯á?­ á??á?­á??á?¹á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.pref_connection.more_info "á??á?­á?¯á??á?¯á?­á?»á??á??á?¹á?·á??á?¶á?¯á?±á??á?¬ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯á??">
-<!ENTITY torbutton.pref_connection_more_info.title "á??á?°á??á?®á??á??á??á??á?°á??á??á?¹">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton á??á?¯á?­ á??á??á?¹á??á?½á?­á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á?«á??á??á?¹á?? Tor Proxy á??á??á?¯á??á?¹á?±á??á?¬ á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á??á?¹á?¡á??á?¼á??á?¹ Torbutton á??á?¯á?­ á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?­á?¯á??á?¹á?±á?¡á?¬á??á?¹ á??á?­á??á?¹á?? á??á??á?¯á?±á??á??á?¬á??á?­á?¯á?? á?»á??á??á?¹á??á?¬á??á?«á?? Tor á??á?ºá?­á??á?¹á??á??á?­á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?­á?¯á??á?«á?? Torbutton á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸á??á??á??á?¹á?»á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??">
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
+<!ENTITY torbutton.prefs.panel_icon_format "á??á??á?ºá?¹á??á?±á??á??á?¯á?¶">
+<!ENTITY torbutton.prefs.tor_settings "á??á??á?±á?¬á??á?·á?ºá??á?®á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸">
+<!ENTITY torbutton.prefs.recommended_settings "á??á?»á?½á??á?ºá??á?±á?¬á?·á?ºá?? Firefox á??á?¬á?¸á??á?¾á??á?ºá?¸á?¡á??á?½á??á?º á?¡á??á?¼á?¶á??á?¼á?¯á??á?¬á?¸á??á??á?·á?º á??á??á?±á?¬á??á?·á?ºá??á?®á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?¯á?¶á?¸á??á?«á??">
+<!ENTITY torbutton.prefs.use_privoxy "Privoxyá??á?­á?¯ á??á?¯á?¶á?¸á??á?«á??">
+<!ENTITY torbutton.prefs.use_polipo "Polipoá??á?­á?¯ á??á?¯á?¶á?¸á??á?«á??">
+<!ENTITY torbutton.prefs.custom_settings "á??á?­á??á?ºá??á?¼á?­á?¯á??á?ºá??á??á?±á?¬á??á?·á?ºá??á?®á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?¯á?¶á?¸á??á?«á??">
+<!ENTITY torbutton.prefs.proxy.host.http "HTTP á??á??á?±á?¬á??á?·á?ºá??á?® -">
+<!ENTITY torbutton.prefs.proxy.host.https "SSL á??á??á?±á?¬á??á?·á?ºá??á?® -">
+<!ENTITY torbutton.prefs.proxy.host.ftp "FTP á??á??á?±á?¬á??á?·á?ºá??á?® -">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher á??á??á?±á?¬á??á?·á?ºá??á?® -">
+<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS á?¡á?­á??á?ºá??á?¾á??á?ºá??á?½á??á?ºá??á?»á?°á??á?¬ -">
+<!ENTITY torbutton.prefs.proxy.port "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º -">
+<!ENTITY torbutton.about.title "Torbutton á?¡á??á?¼á?±á?¬á??á?ºá?¸">
+<!ENTITY torbutton.about.version "á??á?¬á?¸á??á?¾á??á?ºá?¸ - ">
+<!ENTITY torbutton.about.summary "á??á??á?ºá?? Tor á?¡á??á?¯á?¶á?¸á??á?¼á?¯ á??á?¾á?¬á??á?½á?±á??á?¼á??á?ºá?¸á?? á??á?­á?¯á??á?ºá??á?­á?¯á??á?ºá??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¸á??á?­á?¯ á?¡á??á?¬á?¡á??á?½á??á?ºá??á?±á?¸á??á?«á??">
+<!ENTITY torbutton.about.code "á??á?¯á??á?º á??á?«á??á??á?ºá??á?±á?¸á??á?¬á?¸á??á?±á?¸á??á?°á??á?»á?¬á?¸ -">
+<!ENTITY torbutton.about.maintainer "á??á?­á??á?ºá?¸á??á?­á??á?ºá?¸á??á?° -">
+<!ENTITY torbutton.about.security_review "á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¸á??á?­á?¯á??á?ºá??á?¬á??á?¼á??á?ºá??á??á?ºá??á?¯á?¶á?¸á??á??á?ºá??á?»á??á?º -">
+<!ENTITY torbutton.about.donate "á??á??á?ºá??á??á?º Tor á??á?­á?¯ á??á?¯á?¶á?¸á??á?¼á??á?ºá?¸á??á?­á?¯ á??á?¼á?­á?¯á??á?ºá??á?¾á??á?ºá??á??á?ºá??á?»á?¾á??á?º á??á??á?ºá??á??á?º á??á??á?ºá?¸á??á?¬á?¸á??á??á?·á?ºá??á??á?ºá??">
+<!ENTITY torbutton.about.make_donation "á??á?¾á?°á??á?«á??á?ºá?¸á??á?¼á??á?ºá?¸">
+<!ENTITY torbutton.pref_connection.notice "á??á?®á??á??á?ºá??á??á?ºá??á?»á?¬á?¸á??á?­á?¯á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á??á?ºá?¡á??á?½á??á?º Torbutton á??á?­á?¯á?¡á??á?¯á?¶á?¸á??á??á?¼á?¯á??á?«á??">
+<!ENTITY torbutton.pref_connection.more_info "á??á?±á?¬á??á?ºá??á??á?ºá??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸">
+<!ENTITY torbutton.pref_connection_more_info.title "á?¡á??á?°á?¡á??á?®">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton á??á?­á?¯á??á?±á?¬á??á?±á?¬á??á??á?ºá??á?½á??á?º á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?­á?¯á?·á??á??á?±á??á??á?ºá?? á??á??á?ºá??á?»á?¬á?¸á??á?²á?· Tor á??á?¾á??á?·á?ºá??á??á??á?ºá??á?­á?¯á??á?ºá??á?±á?¬ á??á??á?±á?¬á??á?ºá??á?®á??á??á?ºá??á??á?ºá??á?­á?¯á?· á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?­á?¯á??á?»á?¾á??á?º á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? Torbutton á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á??á?¼á?¯á??á?±á??á?² á?¤á??á?±á??á?¬á??á?­á?¯á?·á??á?¼á??á?ºá??á?¬á??á?«á?? á??á??á?ºá??á?»á?¬á?¸á??á?²á?· Tor á??á??á?ºá??á??á?ºá??á?­á?¯á?·á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?­á?¯á??á?»á?¾á??á?º á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? Torbutton á??á?­á?¯á??á?¬á?¸á??á?»á??á?º á??á??á?ºá?¸á??á?­á?¯á?¸á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?«á??">
+<!ENTITY torbutton.context_menu.new_identity "á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸á?¡á??á??á?º">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Tor á?¡á?±á?»á??á?¡á?±á??á?¡á??á?ºá??á?¹á?»á??á??á??á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹">
+<!ENTITY torbutton.context_menu.toggle "Tor á?¡á??á?¼á?±á?¡á??á?±á??á?­á?¯ á?¡á??á?¼á??á?ºá?¡á??á?¾á??á?º á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?­á?¯á??á?ºá??á?«á??">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸ á??á??á??á?¹á?»á??á??á??á??á?ºá?¬á?¸">
+<!ENTITY torbutton.context_menu.preferences "á?¦á?¸á??á?¬á?¸á??á?±á?¸á??á?»á??á?ºá??á?»á?¬á?¸ ...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Torbutton á?¡á?±á?¾á??á?¬á??á?¹á?¸">
+<!ENTITY torbutton.context_menu.about "Torbutton á?¡á??á?¼á?±á?¬á??á?ºá?¸...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "á??á?½á??á?ºá??á?®á?¸ á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.copyTor "Tor URL á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?°á?¸á??á?°á??á?«á??">
+<!ENTITY torbutton.context_menu.copyTor.key "P">
+<!ENTITY torbutton.context_menu.openTorTab "á??á?»á??á?ºá??á?¾á?¬á??á?¬á?¡á??á??á?ºá??á?½á??á?ºTor URL á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?½á??á?·á?ºá??á?«á??">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "á??á??á?ºá?¸á??á?­á?¯á?¸á?¡á??á??á?ºá??á?½á??á?º Tor URLá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?½á??á?·á?ºá??á?«á??">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Torbutton á??á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«">
-<!ENTITY torbutton.prefs.sec_settings "á??á?¶á?¯á?»á??á?¶á?³á??á??á?¡á??á?¼á??á?¹ á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.block_thread "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ history á??á??á?¹á??á??á?»á??á??á?¹á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.block_thwrite "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ history á?±á??á?¸á?»á??á??á?¹á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.block_nthread "Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ history á??á??á?¹á?»á??á??á?¹á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.block_nthwrite "Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ history á?±á??á?¸á?»á??á??á?¹á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.clear_history "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³/á??á?»á??á?³ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?ºá?­á??á?¹á??á?¼á??á?¹ history á??á?¯á?­ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.clear_cache "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³/á??á?»á??á?³ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?ºá?­á??á?¹á??á?¼á??á?¹ Disk cache á?»á??á?³á??á?¯á??á?¹á??á??á??á?½á??á?¹á?· cache á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.block_cache "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ disk á??á?½á??á?¹á?· memory cache á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.cookie_jars "Tor á??á??á?¯á??á?¹á?±á??á?¬ cookies á??á?ºá?¬á?¸á??á?­á?¯ á??á?¬á??á?¼á??á?¹á??á?¬á?¸á??á??á?¹á?· jar á??á?²á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "á??á?­á??á?­á??á?¬á??á?¬ cookies á??á?ºá?¬á?¸á??á?¯á?­ á??á?®á??á?¥á?¹á??á??á?»á??á?³á??á?¯á??á?¹á??á?«á??á??á?¹á?? (á?¡á??á?±á??á??á?¹ á??á?½á?­á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.clear_cookies "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³/á??á?»á??á?³ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?ºá?­á??á?¹á??á?¼á??á?¹ cookies á??á?ºá?¬á?¸á??á?¯á?­ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.disable_plugins "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?½á?­á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ plugins á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.kill_bad_js "á?¡á??á?±á??á??á?¹á??á?½á?­á?±á??á?¬ javascript á??á?ºá?¬á?¸á??á?¯á?­ hook á??á?ºá?­á??á?¹á?»á??á??á?¹á?·á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?¬á?¸á??á??á?¹ á??á?¯á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.isolate_content "Tor á?¡á?±á?»á??á?¡á?±á??á??á?¼á??á?¹ dynamic content á??á?ºá?¬á?¸á??á?­á?¯ á??á?®á?¸á?»á??á?¬á?¸ á??á?²á?¼á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.no_updates "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ update á?¡á??á??á?¹á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.set_uagent "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¡á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?° á??á?¯á?­á??á?¹á??á?¬á?¸á??á?½á??á?¹á??á?­á?¯ á??á??á?¹á??á?½á??á?¹á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.dynamic "á?±á?»á??á?¬á??á?¹á?¸á??á?²á?±á??á?±á??á?¬ á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.cookies "Cookies á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á??á?½á??á?¹á??á??á?¹á?¸á??á?¥á?¹á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.no_search "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ á??á?½á?¬á?±á??á?¼á??á??á?¹ á?¡á?¾á??á?¶á?»á??á?³á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.shutdown "á??á??á?¹á??á?¬á?¸á??á?­á??á?¹á??á?­á??á?¹á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.tor_shutdown "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á?±á??á?¬ browser á??á?¯á?­ á??á?­á??á?¹á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ Tor Cookies á??á?ºá?¬á?¸á??á?­á?¯ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.all_shutdown "á??á??á?¹á??á??á?¹á?·  browser á??á?¯á?­ á??á??á?¯á?­ á??á?­á??á?¹á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ Cookies á??á?ºá?¬á?¸á??á?­á?¯ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.no_shutdown "á??á?­á??á?¹á??á?­á??á?¹á?¸á??á?½á?ºá??á?¹ cookies á??á?ºá?¬á?¸á??á?¯á?­ á??á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á?«á??á?½á??á?¹á?·">
-<!ENTITY torbutton.prefs.disable_sessionstore "á??á?­á??á?¹á?¸á??á??á?¹á?¸á?±á??á??á?¥á?¹ Session á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.headers "á?±á??á?«á??á?¹á?¸á??á??á?¹á?¸á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.spoof_english "US á?¡á??á?¤á??á?­á??á?¹ browser á??á?¯á?­ Spoof á??á?¯á??á?¹á??á??á?¹">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.button.tooltip "Torbutton á??á?­á?¯ á?¡á??á??á?¼á?¯á??á??á?º á??á?¾á?­á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.sec_settings "á??á?¯á?¶á??á?¼á?¯á?¶á??á?¾á?¯á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸">
+<!ENTITY torbutton.prefs.block_thread "Tor á?¡á?¬á?¸ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?±á??á?»á?­á??á?ºá??á?½á??á?º á??á?¾á??á?ºá??á?¬á?¸á??á?²á?·á??á??á?·á?º á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¾á?¯á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á?¯ á??á?­á??á?ºá??á?­á?¯á?·á??á?«á?? (á?¡á??á?­á??á?ºá?¸á?¡á??á?±á?¬á??á?ºá?¸á??á??á?¶á??á?«á??)">
+<!ENTITY torbutton.prefs.block_thwrite "Tor á??á?­á?¯ á??á?½á??á?·á?ºá??á?¬á?¸á??á??á?º á??á?¾á??á?ºá??á??á?ºá?¸á??á?±á?¸á??á?¼á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.block_nthread "Tor á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?ºá??á?­á?¯ á??á?½á??á?·á?ºá??á?¬á?¸á??á??á?º á??á?¾á??á?ºá??á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?¾á?¯á??á?¼á??á?ºá?¸á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?«á?? (á??á??á?½á?±á?¸á??á??á?ºá?¸á??á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.block_nthwrite "Tor á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?ºá??á?­á?¯ á??á?½á??á?·á?ºá??á?¬á?¸á??á??á?º á??á?¾á??á?ºá??á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?±á?¸á??á?¬á?¸á??á?¼á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?«á?? (á??á??á?½á?±á?¸á??á??á?ºá?¸á??á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.clear_history "Tor á?¡á??á?½á??á?·á?ºá?¡á??á?­á??á?ºá?? á??á?¾á??á?ºá??á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?¾á??á?ºá?¸á??á??á?ºá?¸á??á?«á?? (á??á??á?½á?±á?¸á??á?»á??á?ºá??á??á?ºá?¸á??á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.clear_cache "Torá??á??á?­á?¯á??á??á??á?º á?¡á??á?½á??á?·á?ºá?¡á??á?­á??á?º á?¡á??á?¾á??á?·á?ºá?¡á??á?¼á?±á?¬á??á?ºá?¸á?? Tor á??á?±á??á?¬á??á?­á?¯á??á?¾á?®á?¸á??á??á?ºá?¡á??á?½á??á?ºá??á?±á??á?¹á??á??á?¾á??á?ºá??á?¬á??á?ºá??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?¼á?®á?¸ á??á?±á??á?¹á??á??á?¾á??á?ºá??á?¬á??á?ºá??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á?¾á??á?ºá?¸á??á?«á??">
+<!ENTITY torbutton.prefs.block_cache "Torá??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ á??á?±á??á?¬á??á?­á?¯á??á?¾á?®á?¸á??á??á?ºá?¡á??á?½á??á?º á??á?±á??á?¹á??á??á?¾á??á?ºá??á?¬á??á?ºá??á?¾á??á?·á?º á??á?®á??á?­á?¯á??á?®á?¡á??á?½á??á?º á??á?±á??á?¹á??á??á?¾á??á?ºá??á?¬á??á?ºá??á?­á?¯á?·á??á?¾ á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.cookie_jars "á??á?¬á??á?½á??á?ºá??á?¬á?¸á??á??á?·á?º jar á??á?²á?? Tor  á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?ºá??á?¾ á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?«á??">
+<!ENTITY torbutton.prefs.cookie_protection "á??á?½á?±á?¸á??á?»á??á?ºá??á??á?º á??á?½á??á?ºá??á?®á?¸ á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸ á??á?­á?¯á??á?ºá??á?¬á??á?±á?¬á?·á?¡á??á?½á??á?ºá??á?­á?¯ á??á?¯á?¶á?¸á??á?«á??">
+<!ENTITY torbutton.prefs.mmm_cookies "á??á?»á?½á??á?ºá??á?±á?¬á?ºá?? á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?»á?½á??á?ºá??á?±á?¬á?·á?ºá??á?¬á??á?¬á??á?»á?½á??á?ºá??á?±á?¬á?º á??á?®á??á?¶á??á??á?·á?ºá??á?½á?²á??á?½á?¬á?¸á??á??á?ºá?? (á?¡á??á?¹á??á??á?¬á??á?ºá??á?¾á?­á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.clear_cookies "Tor á??á?­á?¯ á?¡á??á?½á??á?·á?ºá?¡á??á?­á??á?ºá??á?¼á?¯á??á?¯á?ºá??á??á?º á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?¾á??á?ºá?¸á??á??á?ºá?¸á??á?«á??">
+<!ENTITY torbutton.prefs.disable_plugins "Tor á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ á??á?¼á??á?·á?ºá??á?½á??á?ºá??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á??á??á?±á??á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?«á?? (á?¡á??á?­á??á?ºá?¸á?¡á??á?±á?¬á??á?ºá?¸á??á??á?¶á??á?«á??)">
+<!ENTITY torbutton.prefs.kill_bad_js "á?¡á??á?¹á??á??á?¬á??á?ºá??á?¾á?­á??á??á?·á?º javascript á??á?­á?¯ á??á?½á?²á??á?»á?­á??á?ºá??á?¬á?¸á??á?«á?? (á?¡á??á?­á??á?ºá?¸á?¡á??á?±á?¬á??á?ºá?¸á??á??á?¶á??á?«á??)">
+<!ENTITY torbutton.prefs.isolate_content "Tor á?¡á??á?¼á?±á?¡á??á?±á??á?­á?¯á?· á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á?¡á??á?¾á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?®á?¸á??á?¼á?¬á?¸á??á?¬á?¸á??á?«á?? (á?¡á??á?­á??á?ºá?¸á?¡á??á?±á?¬á??á?ºá?¸á??á??á?¶á??á?«á??)">
+<!ENTITY torbutton.prefs.no_updates "Tor á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ á?¡á??á??á?·á?ºá??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?¡á?±á?¬á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.set_uagent "Tor á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¾á?¯á?¡á??á?½á??á?º á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?°á?¡á?±á?¸á??á?»á??á?·á?ºá??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á?? (á?¡á??á?­á??á?ºá?¸á?¡á??á?±á?¬á??á?ºá?¸á??á??á?¶á??á?«á??)">
+<!ENTITY torbutton.prefs.dynamic "á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á?¡á??á?¾á??á?º">
+<!ENTITY torbutton.prefs.cookies "á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸">
+<!ENTITY torbutton.prefs.cache "á??á?±á??á?¹á??á??á?­á??á?ºá?¸á??á?¾á??á?ºá??á?¬á??á?º">
+<!ENTITY torbutton.prefs.history "á??á?¾á??á?ºá??á??á?ºá?¸">
+<!ENTITY torbutton.prefs.no_search "Tor á??á?¯á?¶á?¸á??á?±á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ á??á?¾á?¬á??á?½á?±á??á?¾á?¯á?¡á??á?¼á?¶á??á?¼á?¯á??á?»á??á?ºá??á?»á?¬á?¸á?¡á?¬á?¸ á??á??á??á?­á?¯á??á?ºá?¡á?±á?¬á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.shutdown "á??á??á?ºá??á?­á?¯ á??á?­á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.tor_shutdown "Tor á??á??á?­á?¯á??á?ºá??á??á?·á?º á??á??á?±á?¬á??á?·á?ºá??á?¬á??á?­á?¯ á??á?­á??á?ºá??á?­á?¯á??á?ºá??á?»á?­á??á?ºá??á?½á??á?º Tor á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?¾á??á?ºá?¸á??á??á?ºá?¸á??á?«á??">
+<!ENTITY torbutton.prefs.all_shutdown "á??á??á?ºá??á??á?·á?º á??á??á?±á?¬á??á?·á?ºá??á?¬á??á?­á?¯á??á??á?­á?¯ á??á?­á??á?ºá??á?­á?¯á??á?ºá??á??á?·á?ºá?¡á??á?«á??á?­á?¯á??á?ºá?¸ á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?¾á??á?ºá?¸á??á??á?ºá?¸á??á?«á??">
+<!ENTITY torbutton.prefs.no_shutdown "á??á??á?ºá??á?­á??á?ºá??á?»á?­á??á?ºá?? á??á?»á?½á??á?ºá??á?±á?¬á?·á?ºá??á??á?½á??á?ºá??á?®á?¸á??á?­á?¯ á??á??á?¾á??á?ºá?¸á??á??á?ºá?¸á??á??á?ºá??á?«á??á?¾á??á?·á?ºá??">
+<!ENTITY torbutton.prefs.disable_sessionstore "á??á?¾á??á?ºá??á?¬á??á?ºá?¡á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?­á?¯á??á?­á??á?ºá?¸á??á?¼á??á?ºá?¸á??á?­á?¯ á??á??á??á?±á??á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.headers "á??á?±á?«á??á?ºá?¸á??á??á?ºá?¸á??á?»á?¬á?¸">
+<!ENTITY torbutton.prefs.spoof_english "á?¡á??á?±á??á?­á??á??á?ºá?¡á??á?ºá?¹á??á??á?­á??á?ºá??á?¬á??á?¯á?¶á?¸á??á??á?±á?¬á??á?·á?ºá??á?¬á?¡á?¬á?¸ á??á?¯á?¶á??á?¾á?¬á?¸á??á?­á?¯á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.refererspoofing "á??á?½á?¾á??á?ºá?¸á??á?°á??á?¾ á??á?¯á?¶á??á?¾á?¬á?¸á??á?­á?¯á??á?ºá??á?¼á??á?ºá?¸">
 <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.smartspoof "Tor á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ á??á?½á?¾á??á?ºá?¸á??á?° á??á?¯á?¶á??á?¾á?¬á?¸á??á?­á?¯á??á?ºá??á?¼á??á?ºá?¸á??á?¾á?¬ á??á?±á?¬á??á?ºá?¸á??á?¾á??á??á?ºá?? (á??á?­á?¯á??á?­á??á?ºá?¸á??á?½á?¾á??á?ºá?¸á??á?°á??á?»á?¬á?¸á??á?­á?¯á??á?¼á??á?ºá??á?»á??á?ºá??á?¯á?¶á??á?¾á?¬á?¸á??á?­á?¯á??á?ºá??á??á?ºá??)">
 <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ DOM á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.forms "á?»á??á??á?·á?¹á??á?¼á??á?¹á??á?¶á?¯á??á?¶á??á?¼á??á?¹á??á?ºá?¬á?¸">
-<!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.restore_tor "Session á?»á??á??á?¹á??á??á?¹á??á??á??á?¹á??á?½á?ºá??á?¹á?? Tor á?¡á?±á?»á??á?¡á?±á??á??á?­á?¯ á??á??á?¹á??á?½á??á?¹á??á??á?¹ :">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??á?¹á??á??á?¹á??á??á?¼á?¬á?¸á??á?½á?ºá??á?¹ cookie jar á??á?¯á?­ á?»á??á??á?¹á??á??á?¹ á??á??á?¹á??á?­á?¯á??á??á?°á??á??á?¹/ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Tor á??á?½á??á?¹á?· Tor á??á??á?¯á??á?¹á?±á??á?¬ cookies á??á?ºá?¬á?¸á??á?¯á?­ á??á?¬á??á?¼á??á?¹á??á?¬á?¸á?±á??á?¬ jars á??á?ºá?¬á?¸á??á?²á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.clear_http_auth "HTTP á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á??á??á?¹á?±á??á?¸á?±á??á?¬ á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.block_js_history "Tor á?¡á?±á?»á??á?¡á?±á??á??á?­á?¯á?? history á??á?½á?¬á?±á??á?¼á??á?¼á?¬á?¸á??á?¬á??á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á??á?­á?¯ á??á?®á?¸á?»á??á?¬á?¸ á??á?²á?¼á?»á??á?¬á?¸ á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ windows á??á?¯á?­ 50 px á??á?­á?¯á?? á?¡á??á?¼á??á?¹á?¡á??á?¬á?¸ á??á?¬á?¸á??á?½á?­á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.close_tor "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ Tor windows á??á?ºá?¬á?¸á??á?½á??á?¹á?· tabs á??á?ºá?¬á?¸ á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?¯á?­ á??á?­á??á?¹á??á?­á??á?¹á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.close_nontor "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ Tor á??á??á?¯á??á?¹á?±á??á?¬ windows á??á?ºá?¬á?¸á??á?½á??á?¹á?· tabs á??á?ºá?¬á?¸ á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?¯á?­ á??á?­á??á?¹á??á?­á??á?¹á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.block_links "á??á??á?°á??á?®á?±á??á?¬ Tor á?¡á?±á?»á??á?¡á?±á??á??á?ºá?¬á?¸á??á?¼á??á?¹ á??á?ºá?­á??á?¹á??á??á?¹á??á??á?¹á?·á??á?¹á??á?ºá?¬á?¸á??á?¯á?­ á??á?¯á?­ á??á??á??á?¹á??á?¯á??á?¹á?»á??á??á?¹á?¸á??á?½á??á?¹á?· á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á?ºá?¬á?¸ á?»á??á??á?¹á??á??á?¹ á?±á??á??á??á?°á?»á??á??á?¹á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.jar_certs "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á?¬ á??á?­á?¯á??á??á??á?¯á??á?¹ Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á?±á??á?¬ á?¡á?±á?»á??á?¡á?±á??á??á?¼á??á?¹ SSL certs á??á?ºá?¬á?¸á??á?¯á?­ á??á?®á?¸á?»á??á?¬á?¸ jars á??á?ºá?¬á?¸á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á?¬ á??á?­á?¯á??á??á??á?¯á??á?¹ Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á?±á??á?¬ á?¡á?±á?»á??á?¡á?±á??á??á?¼á??á?¹ CA certs á??á?ºá?¬á?¸á??á?¯á?­ á??á?®á?¸á?»á??á?¬á?¸ jars á??á?ºá?¬á?¸á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.locked_mode "á??á?±á??á?¬á?¹á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?? á??á?»á??á??á?¹á?±á??á??á??á?¹ Button á??á?½á??á?¹á?· Hotkeys á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.startup_state "á??á?¶á?¯á??á?½á??á?¹ á??á??á??á?¹á??á??á??á?ºá?¬á?¸á??á?¼á??á?¹ Tor á?¡á?±á?»á??á?¡á?±á??á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á??á??á?¹ :">
-<!ENTITY torbutton.prefs.shutdown_state "á??á??á?¹á??á??á?¹á??á??á?­á??á?¹á??á?­á??á?¹á?¸á??á?? á?¡á?±á?»á??á?¡á?±á??">
-<!ENTITY torbutton.prefs.startup "á??á??á??á?¹á??á??">
-<!ENTITY torbutton.prefs.block_tor_file_net "Network á??á?¯á?­á?? Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á??á?¹ file:// urls (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Network á??á?­á?¯á?? Tor á??á??á?¯á??á?¹á?±á??á?¬ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á??á?¹ file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "á??á?°á??á?¡á?±á?»á??á?¡á?±á??á??á?­á?¯á?? á?»á??á??á?¹á??á??á?¹ á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.test_settings "á??á?ºá?­á??á?¹á??á?­á??á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á?¸á??á??á?¹á??á??á?¹">
-<!ENTITY torbutton.prefs.test_auto "Firefox á??á??á??á?¹á?»á??á?®á?¸ á??á??á??á??á?¶á?¯á?¸ á?±á?»á??á?¬á??á?¹á?¸á??á?²á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?»á??á?®á?¸á??á?½á?ºá??á?¹ á??á?­á??á?­á?? Tor á??á?ºá?­á??á?¹á??á?­á??á??á??á??á?ºá?¬á?¸á??á?­á?¯ á?»á??á??á?¹á??á??á?¹ á??á??á?¹á?¸á??á??á?¹á??á??á?¹">
+<!ENTITY torbutton.prefs.disable_domstorage "Tor á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?±á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ DOM á??á?­á??á?ºá?¸á??á??á?ºá?¸á??á?¾á?¯á??á?­á?¯ á??á??á??á?­á?¯á??á?ºá?¡á?±á?¬á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?«á?? (á?¡á??á?­á??á?ºá?¸á?¡á??á?±á?¬á??á?ºá?¸á??á??á?¶á??á?«á??)">
+<!ENTITY torbutton.prefs.forms "á??á?¯á?¶á??á?¶á??á?»á?¬á?¸">
+<!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.restore_tor "á??á??á?ºá??á?¾á??á?ºá??á?­á?¯ á??á??á?­á?¯á?¡á??á?­á?¯á??á?ºá?¸ á??á?¼á??á?ºá??á?¯á??á?ºá??á?¼á?®á?¸  á??á??á?­á?¯á??á??á??á?ºá?¡á??á??á?¼á?¯á??á?¬á?? Tor á?¡á??á?¼á?±á?¡á??á?±á??á?­á?¯ á??á?±á?¬á?ºá??á?¼á??á?«á?¡á??á?­á?¯á??á?ºá?¸ á??á??á?ºá??á?¾á??á?ºá??á?«á?? -">
+<!ENTITY torbutton.prefs.startup_tor "á??á??á?±á?¬á??á?·á?ºá??á?¬á??á?­á?¯ á??á??á??á?½á??á?·á?ºá??á?»á??á?ºá?¸á??á?½á??á?º Tor á?¡á??á?¼á?±á?¡á??á?±á??á?­á?¯ á??á?±á?¬á?ºá??á?¼á??á?«á?¡á??á?­á?¯á??á?ºá?¸ á??á??á?ºá??á?¾á??á?ºá??á?«á?? - ">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?¬á??á?¾ á??á?¯á??á?ºá??á??á??á?º á??á??á?ºá??á??á?·á?ºá??á?½á?¬á?¸á??á??á?·á?ºá?¡á??á?« á??á?½á??á?ºá??á?®á?¸ jar á??á?­á?¯ á??á?¼á??á?ºá??á?½á?²á??á??á?ºá??á?«á?? (á??á?­á?¯á?·á??á??á?¯á??á?º) á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?¾á??á?ºá?¸á??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Tor á??á?¾á??á?·á?º Tor á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?º á??á??á??á?ºá??á?­á?¯á?·á??á?¾ á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?¬á??á?½á??á?ºá??á?¬á?¸á??á??á?·á?º jar á??á?»á?¬á?¸á?¡á??á?±á??á?¼á??á?·á?º á??á?­á??á?ºá?¸á??á?«á?? (á?¡á??á?¹á??á??á?¬á??á?ºá??á?¾á?­á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.clear_http_auth "HTTP auth á??á??á?ºá??á?¾á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¾á??á?ºá?¸á??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.block_js_history "Tor á?¡á??á?¼á?±á?¡á??á?±á??á?­á?¯á?· á??á?¾á??á?ºá??á??á?ºá?¸ á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?¼á??á?¬á?¸á??á?»á??á?ºá?¡á?¬á?¸ á??á??á?ºá??á?±á?¬á??á?ºá??á?¼á??á?ºá?¸á??á?­á?¯ á??á?®á?¸á??á?¼á?¬á?¸á??á?½á?²á??á?¬á?¸á??á??á?ºá?? (á?¡á??á?­á??á?ºá?¸á?¡á??á?±á?¬á??á?ºá?¸á??á??á?¶á??á?«á??)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Tor á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ á??á??á?ºá?¸á??á?­á?¯á?¸á??á?»á?¬á?¸á??á?­á?¯ á?¡á?? á??á?? á??á??á?ºá??á??á?ºá??á?­á?¯á?· á?¡á??á?½á??á?º á??á?¼á?±á?¬á??á?ºá?¸á??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.close_tor "Tor á??á?­á?¯ á?¡á??á?½á??á?·á?ºá?¡á??á?­á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á??á?º á??á??á?ºá?¸á??á?­á?¯á?¸á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?¾á??á?·á?º á??á?»á??á?ºá??á?¾á?¬á??á?¬á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á?­á??á?ºá??á?«á?? (á??á??á?½á?±á?¸á??á?»á??á?ºá??á??á?ºá?¸á??á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.close_nontor "Tor á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?ºá??á?­á?¯ á?¡á??á?½á??á?·á?ºá?¡á??á?­á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á??á?º á??á??á?ºá?¸á??á?­á?¯á?¸á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?¾á??á?·á?º á??á?»á??á?ºá??á?¾á?¬á??á?¬á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á?­á??á?ºá??á?«á?? (á??á??á?½á?±á?¸á??á?»á??á?ºá??á??á?ºá?¸á??á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.block_links "á??á??á?°á??á?®á??á??á?·á?º Tor á?¡á??á?¼á?±á?¡á??á?±á??á?»á?¬á?¸á??á?¾ á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¼á?±á?¬á??á?ºá?¸á??á?¾á?­á??á?ºá??á?»á??á?ºá??á?»á?¬á?¸á??á?¾á??á?·á?º á??á?¬á??á?»á??á?ºá??á?¾á?¬ á??á?¼á??á?ºá??á?½á?²á??á??á?ºá??á?¼á??á?ºá?¸á??á?»á?¬á?¸ á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?«á?? (á??á??á?½á?±á?¸á??á?»á??á?ºá??á??á?ºá?¸á??á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.jar_certs "Tor/Tor á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?º á??á?­á?¯á?·á?¡á??á?½á??á?º á??á?®á?¸á??á?¼á?¬á?¸ jar á??á?»á?¬á?¸á??á?²á?? SSL á?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯á??á?½á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Tor/Tor á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?º á??á?­á?¯á?·á?¡á??á?½á??á?º á??á?®á?¸á??á?¼á?¬á?¸ jar á??á?»á?¬á?¸á??á?²á?? CA á?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯á??á?½á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!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 "file:// urls á??á?¾ á??á?½á??á?ºá??á??á?ºá??á?­á?¯á?·  Tor á??á?¾ á??á??á?ºá??á?¬á??á?ºá??á?¼á??á?ºá?¸á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?«á?? (á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "file://urls á??á?¾ á??á?½á??á?ºá??á??á?ºá??á?­á?¯á?· Tor á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?ºá??á?­á?¯á?· á??á??á?ºá??á?±á?¬á??á?ºá??á?¼á??á?ºá?¸á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.restore_defaults " á??á?°á??á?¡á??á?¾á?­á?¡á??á?­á?¯á??á?ºá?¸ á??á?¼á??á?ºá??á?¬á?¸á??á?«á??">
+<!ENTITY torbutton.prefs.test_settings "á??á??á?ºá??á?±á?¸á??á?¾á?¯á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸">
+<!ENTITY torbutton.prefs.test_auto "Firefox á??á??á??á?ºá??á??á?·á?º á?¡á??á?»á?­á??á?ºá??á?­á?¯á??á?¸ Tor á??á?­á?¯ á??á??á?½á??á?·á?ºá??á?¼á?®á?¸á??á?±á?¬á??á?º á??á?»á?½á??á?ºá??á?±á?¬á?ºá?? Tor á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?«á??">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Tor cookies á??á?ºá?¬á?¸á??á?­á?¯ disk á?¡á??á?¼á??á?¹á?¸á??á?¯á?­á?? á?±á??á?¸á??á?¬á?¸á?»á??á??á?¹á?¸ á??á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Tor á??á??á?¯á??á?¹á?±á??á?¬ cookies á??á?ºá?¬á?¸á??á?¯á?­ disk á?¡á??á?¼á??á?¹á?¸á??á?­á?¯á?? á?±á??á?¸á??á?¬á?¸á?»á??á??á?¹á?¸ á??á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.session_restore "session á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¡á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ á??á??á?¹á??á?½á??á?¹á?· á?»á??á??á?¹á??á??á?¹ á??á??á?¹á??á?°á??á??á?¹ tabs á??á?ºá?¬á?¸ :">
-<!ENTITY torbutton.prefs.nontor_tabs "Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á?±á??á?¬ á??á??á?¹á??á?°á??á?¬á?¸á??á??á?¹á?· tabs á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.tor_tabs "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³ á??á??á?¹á??á?°á??á?¬á?¸á??á??á?¹á?· tabs á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.tor_memory_jar "Tor á??á?¾ á??á?½á??á?ºá?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?½á??á?ºá?¸á??á?­á?¯á?· á??á??á?±á?¸á??á?¾á??á?ºá??á?«á??á?¾á??á?·á?ºá??">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Tor á??á??á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á??á??á?ºá??á?¾ á??á?½á??á?ºá??á?®á?¸á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?½á??á?ºá?¸á??á?­á?¯á?· á??á??á?±á?¸á??á?¾á??á?ºá??á?«á??">
+<!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 "á??á??á?¹á?¸á??á?­á?¯á??á?¡á??á?¼á??á?¹ proxy á??á??á?½á?­á??á?«:">
-<!ENTITY torbutton.prefs.no_proxy_warning "á??á??á?­á?±á??á?¸á??á?ºá??á?¹: á?¡á??á??á?¹á?±á??á?¬á?¹á?»á??á??á?« hostname á??á?ºá?¬á?¸á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
-<!ENTITY torbutton.cookiedialog.nameCol "Name">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ livemarks á?¡á??á??á?¹á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.dtd_recommended "(á?¡á?¾á??á?¶á?»á??á?³á??á?«á??á??á?¹)">
-<!ENTITY torbutton.prefs.dtd_optional "(á?±á??á?¬á??á?¹á??á??á?¹á??á??á?¹á??á??á?¹á?¸)">
-<!ENTITY torbutton.prefs.dtd_crucial "(á?¡á?±á??á?¸á?¾á??á?®á?¸á?±á??á?¬)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton Updates á??á?ºá?¬á?¸á?¡á?¬á?¸ Tor á??á?½á??á??á??á?¹á?·á??á?¼á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Google Captcha á??á?½á??á?¹á?·á??á?­á?¯á?¸á??á?«á?? á??á?»á??á?¬á?¸ search engine á??á??á?¹á??á?¯ á?¡á??á?­á?¯á?¡á?±á??á?½á?ºá?¬á??á?¹á?±á?»á??á?¬á??á?¹á?¸á??á?¶á?¯á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.no_proxies_on "á??á?±á?¬á?ºá??á?¼á??á?«á?¡á??á?½á??á?º á??á??á?±á?¬á??á?·á?ºá??á?®á??á?»á?¬á?¸ á??á??á?¾á?­á??á?« -">
+<!ENTITY torbutton.prefs.no_proxy_warning "á??á??á?­á??á?±á?¸á??á?»á??á?º - á?¡á??á??á?ºá??á?« á??á??á?ºá??á??á?·á?ºá??á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¼á??á?ºá?¸á??á?­á?¯ á??á?¾á?±á?¬á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.spoofreresh "á??á??á?ºá??á?ºá??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?¼á??á?ºá??á?±á?«á?ºá??á?­á?¯á??á?¾á?¯á?¡á?¬á?¸á??á?¯á?¶á??á?¾á?¬á?¸á??á?­á?¯á??á?ºá??á?«">
+<!ENTITY torbutton.prefs.refereroptions "á??á?½á?¾á??á?ºá?¸á??á?° á??á?¯á?¶á??á?¾á?¬á?¸á??á?­á?¯á??á?ºá??á?¼á??á?ºá?¸ á??á?½á?±á?¸á??á?»á??á?ºá??á??á?¬á??á?»á?¬á?¸">
+<!ENTITY torbutton.prefs.nospoof "á??á??á?ºá??á?½á?¾á??á?ºá?¸á??á?°á?¡á?¬á?¸ á??á??á?¯á??á??á?«á??á?¾á??á?·á?º">
+<!ENTITY torbutton.prefs.spoofroot "á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á??á?­á?¯á??á?ºá??á?½á?²á??á?«á??á??á?ºá??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¯á??á??á?«á??">
+<!ENTITY torbutton.prefs.spoofdomain "á??á??á?ºá??á?½á?¾á??á?ºá?¸á??á?°á?¡á??á?¼á??á?º á??á?­á?¯á??á?­á??á?ºá?¸á??á?­á?¯ á??á?¯á??á??á?«á??">
+<!ENTITY torbutton.prefs.spoofblank "á??á??á?ºá??á?½á?¾á??á?ºá?¸á??á?°á?¡á??á??á?ºá?¡á?¬á?¸ á??á??á??á?·á?ºá??á?²á??á?¬á?¸á??á?«á??">
+<!ENTITY torbutton.cookiedialog.title "á??á?½á??á?ºá??á?®á?¸á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?®á??á?¶á??á??á?·á?ºá??á?½á?²á??á?«á??">
+<!ENTITY torbutton.cookiedialog.lockCol "á??á?¬á??á?½á??á?ºá??á?¬á?¸á??á?¼á?®á?¸á??á?¼á??á?ºá??á??á?ºá??">
+<!ENTITY torbutton.cookiedialog.domainCol " á?¡á?­á??á?ºá??á?¾á??á?ºá??á?½á??á?ºá??á?»á?°á??á?¬">
+<!ENTITY torbutton.cookiedialog.nameCol "á?¡á??á??á?º">
+<!ENTITY torbutton.cookiedialog.pathCol "á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸">
+<!ENTITY torbutton.cookiedialog.protectCookie "á??á?½á??á?ºá??á?®á?¸á??á?­á?¯ á??á?¬á??á?½á??á?ºá??á?«á??">
+<!ENTITY torbutton.cookiedialog.removeCookie "á??á?½á??á?ºá??á?®á?¸á??á?­á?¯ á??á??á?ºá??á?¯á??á?ºá??á?«á??">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "á??á?½á??á?ºá??á?®á?¸á??á?­á?¯ á??á?¬á??á?½á??á?ºá??á??á?¬á?¸á??á?«á??">
+<!ENTITY torbutton.cookiedialog.removeAllBut "á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á??á?ºá??á?¯á??á?ºá??á?«á?? á??á?­á?¯á?·á??á?±á?¬á?º á?¡á??á?¬á?¡á??á?½á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?¬á?¸á??á??á?ºá??">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "á??á?½á??á?ºá??á?®á?¸á?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¬á??á?½á??á?ºá??á?«á??">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á??á?½á??á?ºá??á?®á?¸á?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¬á??á?½á??á?ºá??á??á?¬á?¸á??á?«á??á?¾á??á?·á?ºá??">
+<!ENTITY torbutton.prefs.disable_livemarks "Tor á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ Livemark á?¡á??á??á?·á?ºá??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á??á?±á??á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.dtd_recommended "(á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.dtd_optional "(á??á??á?½á?±á?¸á??á?»á??á?ºá??á??á?ºá?¸á??á??á??á?ºá??)">
+<!ENTITY torbutton.prefs.dtd_crucial "(á?¡á??á?­á??á?ºá?¸á?¡á??á?±á?¬á??á?ºá?¸á??á??á?¶á??á?«á??)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Tor á??á?¾á??á??á??á?·á?º Torbutton á?¡á??á??á?·á?ºá??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á??á?·á?º á??á?½á?¾á?²á??á?«á??">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Google Captcha á??á??á?­á?¯á??á??á??á?º á??á?¾á??á?·á?ºá?¡á??á?° á??á?±á?¬á?ºá??á?¼á??á??á?·á?ºá?¡á??á?« á??á?¾á?¬á??á?½á?±á??á?¾á?¯á?¡á??á?ºá??á?»á??á?ºá??á?±á?¬á??á?ºá??á??á?ºá??á?»á?­á?¯á?¸á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?¯á?¶á?¸á??á?«á??">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
-<!ENTITY torbutton.prefs.fix_google_srch "Google Search Box queries á??á?½ platform á??á?½á??á?¹á?· language á??á?ºá?¬á?¸á?±á?»á??á?¬á??á?¹á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.fix_google_srch "Google á??á?¾á?¬á??á?½á?±á??á?¾á?¯á?¡á??á?½á??á?ºá??á?¾á?­ á??á?±á?¸á??á?½á??á?ºá?¸á??á?»á?¬á?¸á??á?¾ á??á??á??á?ºá??á?±á?¬á??á?ºá?¸á??á?¾á??á?·á?º á??á?¬á??á?¬á??á??á?¬á?¸á??á?­á?¯á?·á??á?­á?¯ á??á??á?ºá??á?¯á??á?ºá??á?«á??">
+<!ENTITY torbutton.prefs.transparentTor "á??á?­á??á?¬á??á?¼á??á?ºá??á?¬á??á?¼á??á?ºá??á??á?·á?º Tor á??á?¼á??á?ºá??á?±á??á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸ (á??á?­á?¯á??á?ºá??á?¾á??á?ºá??á??á?ºá??á?¬ Tor Router á??á?­á?¯á?·á??á??á?¯á??á?º transproxy  á??á??á?ºá??á?¯á??á?¯á??á?­á?¯ á??á?­á?¯á?¡á??á?ºá??á??á?ºá??)">
diff --git a/src/chrome/locale/my/torbutton.properties b/src/chrome/locale/my/torbutton.properties
index 6de6035..ece3efa 100644
--- a/src/chrome/locale/my/torbutton.properties
+++ b/src/chrome/locale/my/torbutton.properties
@@ -1,42 +1,45 @@
-torbutton.button.tooltip.disabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹
-torbutton.button.tooltip.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á??á?­á??á?¹á??á??á?¹á??á??á?¹
-torbutton.panel.tooltip.disabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á?»á??á?³á??á?¯á?­á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
-torbutton.panel.tooltip.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á??á?­á??á?¹á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
-torbutton.panel.plugins.disabled = Plugins á??á?ºá?¬á?¸ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
-torbutton.panel.plugins.enabled = Plugins á??á?ºá?¬á?¸ á??á?­á??á?¹á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
-torbutton.panel.label.disabled = Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¯á?­á??á?¹á??á?«
-torbutton.panel.label.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á?«á??á??á?¹á??
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Tor proxy á??á?¯á?­ Firefox á??á?¼á??á?¹ á?¡á??á?¼á??á?¹á??á??á?° á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á?»á??á?³á??á??á?¹/ á??á?»á??á?³á??á??á?¹ Torbutton á??á?½ á??á??á?¯á??á?¹á??á??á?¹á??á?¯á??á?¯á?­ á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á?¬á?¸á??á?«á??á??á?¹
-torbutton.popup.history.warning = á?¡á?»á??á?¬á?¸ Tor state á??á?½ loading á??á??á?¹á?±á??á?±á??á?¬ á?¡á??á?¬á??á?ºá?¬á?¸á?¡á?¬á?¸ Torbutton á??á?½ á??á?­á??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??\n\nFirefox Bugs 409737 á??á?½á??á?¹á?· 417869 á??á?¼á??á?¹á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?«á??á??á?¹á??\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = plugin á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?¯á?­ Tor á??á?½ á??á?¯á?­á??á?¹á??á?¯á?­á??á?¹ á??á??á?¹á??á?°á?»á??á??á?¹á?¸á??á?¯á?­ Torbutton á??á?½ á??á?­á??á?¹á??á??á?¹á??á?«á??á??á?¹á?? \n\nSave-As á??á?­á?¯ á?¡á??á?¬á?¸á??á?¯á?­á?¸ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á?? \n\n
-torbutton.popup.confirm_ca_certs = Torbutton á??á?½á??á?¹á??á?ºá??á?¹: á??á??á?¹á?·á?¡á??á?¼á??á?¹  á?»á??á?³á??á?¯á??á?¹á??á?¬á?¸á?±á??á?¬ Certificate Authorities á??á?±á??á?¬á?¹á?»á??á??á?¬á?¸á??á?«á?? Certificate Authority á??á?¬á??á??á?¹á?¸ á??á??á?¹á?±á??á?¸á??á?½á?¬á?±á??á?¼á?»á??á??á?¹á?¸á??á??á?¹ Tor á?±á?»á??á?¬á??á?¹á?¸á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?­á?¯ á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?¯á?­á??á?¹á?»á??á?®á?¸ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?¬á??á?¼á??á?¹ á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?¯á?­á??á?¹á??á?«á??á??á?¹á?? Certificate Authority certificates á??á?ºá?¬á?¸ á??á?²á?¼á?»á??á?¬á?¸á??á?¬á?¸á??á?½á?­á?»á??á??á?¹á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?­á?¯á??á?«á??á??á?¬á?¸ ? (á??á??á?¹ á??á?¯á?­á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬á??á?¯á?­ á??á?¬á?¸á??á??á?¹á?»á??á??á?¹á?¸ á??á??á?½á?­á??á?«á??á?½á?ºá??á?¹ OK á??á?¯á?­ á??á??á??á?¹á??á?½á?­á??á?¹á?»á??á??á?¹á?¸á?»á??á??á?¹á?· á??á?¶á?¯á?»á??á?¶á?³á??á?­á??á?¹á??á?ºá??á?¯á?­á??á?¹á??á?«á??á??á?¹)
-torbutton.popup.ff3.warning = á??á??á?­á?±á??á?¸á??á?ºá??á?¹!\n\ná??á??á?¹á?? á?¡á??á?ºá?­á??á?¹á?±á??á??á??á?¯á??á?¹á??á?½á??á?¹á?· livemarks á??á?ºá?¬á?¸ á?±á??á?«á??á?¹á?¾á??á?¬á?¸á?»á??á??á?¹á?¸á??á?­á?¯ Firefox 3 á??á?¼á??á?¹ Torbutton á??á??á?¹ Tor á??á?½á??á??á??á?¹á?· á?»á??á??á?¹á?±á??á??á?±á??á??á?¯á?­á??á?¹á??á?«á??á??á?¹á?? \n\ná??á??á?¹á??á?¯á?­á??á??á??á?¹á?»á??á??á?¹á?±á?? á?±á??á?½á??á??á?­á?¯á?? á??á??á?¹á??á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹ á??á?¯á?­á??á?«á??á??á?¬á?¸ ?
-torbutton.popup.toggle.warning = á??á?ºá?­á??á?­á??á??á??á??á?ºá?¬á?¸ á?¡á??á?ºá?­á?³á?¸á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á?½á?­á?±á??á??á??á?¹ Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?½á??á?¹á?· á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹ á??á?­á?¯á??á??á??á?¯á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á??á?¹á??á??á?¹ á??á?­á?¯á?¡á??á?¹á??á?«á??á??á?¹
-torbutton.popup.test.success = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á??á??á?¹ !
-torbutton.popup.test.failure = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?« ! á??á??á?¹á?? proxy á??á?½á??á?¹á?· Privoxy á??á?ºá?­á??á?¹á??á?­á??á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á?±á??á?¸á??á?«á??
-torbutton.popup.test.confirm_toggle = á?±á??á?¬á??á?¹á??á?¶á?¯á?¸á??á??á?¹á?¸á??á??á?¹á??á?¬á?¸á?±á??á?¬ Proxy Test á??á?½ Tor á??á?­á?¯á??á??á??á??á?¹á??á?­á?¯á??á?¹á??á?«á?? \n\nTor á??á?­á?¯ enable á??á?¯á??á?¹á??á??á?¹á?±á??á??á?ºá?¬á??á?«á??á??á?¬á?¸á??\n\ná??á??á?­á?»á??á?³á??á??á?¹-á?»á??á??á?¹á??á??á?¹á??á?½á?³á??á?ºá?¬á?¸á??á?­á?¯á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸á??á?«á??á?? Torbutton Proxy Preferences window á??á?½ á?¤á??á??á?­á?±á??á?¸á??á?ºá??á?¹á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?­á?¯á?¹á??á?¹á??á?«á??á??á?¹á??
-torbutton.popup.test.ff3_notice = Tor proxy á??á?ºá?­á??á?¹á??á?­á??á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á??á?¹á?¸á??á??á?¹á??á??á?¹ OK á??á?¯á?­ á??á??á??á?¹á??á?½á?­á??á?¹á??á?«á?? á??á??á?¹á?¸á??á??á?¹á??á??á??á??á?¹ á?±á??á?¬á??á?¹á??á?¼á??á?¹á??á?¼á??á?¹ á?»á??á?³á??á?¯á??á?¹á??á?«á??á??á?¹á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹á?¸á??á?¶á?±á??á?¬á??á?¹á?·á??á?¯á?­á??á?¹á?¸á?±á??á?¸á??á?«á??á??á?¹á??
-torbutton.panel.label.verified = Tor á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á?¡á??á??á?¹á?»á??á?³á??á?«á??á??á?¹
-torbutton.popup.test.auto_failed = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ Tor proxy á??á??á?¹á?±á??á?¸á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á?? \n\ná??á??á?¹á??á?­á?¯á??á??á??á?¹á?»á??á??á?¹á?±á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹ á?±á??á??á?ºá?¬á??á?«á??á??á?¬á?¸ ?
-torbutton.prefs.recommended = (á?¡á?¾á??á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)
-torbutton.prefs.optional = (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)
-torbutton.prefs.crucial = (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-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 Tails LiveCD or torsocks.\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
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.button.tooltip.disabled = Tor á??á?­á?¯ á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?ºá??
+torbutton.button.tooltip.enabled = Tor á??á?­á?¯ á?¡á??á?¯á??á?ºá??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á?«á??
+torbutton.panel.tooltip.disabled = Tor á??á?­á?¯ á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?ºá??á?­á?¯ á??á?¾á?­á??á?ºá??á?«á??
+torbutton.panel.tooltip.enabled = Tor á??á?­á?¯ á?¡á??á?¯á??á?ºá??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á?« á??á?­á?¯ á??á?¾á?­á??á?ºá??á?«á??
+torbutton.panel.plugins.disabled = á??á?¼á??á?·á?ºá??á?½á??á?ºá??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?º á??á?¾á?­á??á?ºá??á?«á??
+torbutton.panel.plugins.enabled = á??á?¼á??á?·á?ºá??á?½á??á?ºá??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?¯á??á?ºá??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?º á??á?¾á?­á??á?ºá??á?«á??
+torbutton.panel.label.disabled =  Tor á??á?­á?¯ á?¡á??á?¯á??á?ºá??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?«á??
+torbutton.panel.label.enabled = Tor á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á??á??á?ºá??
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton á??á??á?º Firefox á?¡á?¬á?¸ Tor á??á??á?±á?¬á??á?·á?ºá??á?®á??á?­á?¯á?· á??á?½á??á?ºá??á?°á??á?½á?¬ á??á?½á?¾á??á?ºá??á?¼á??á?­á?¯á??á?ºá??á?±á??á??á?·á?º (á??á?­á?¯á?·) á??á?½á?¾á??á?ºá??á?¼á??á?¾á?¯á??á?­á?¯á??á?»á?±á?¬á??á?ºá??á??á?ºá??á?­á?¯á??á?ºá??á??á?·á?º á??á??á?¯á??á?ºá??á??á?ºá??á?¯á??á?­á?¯ á??á?±á?¬á??á?ºá??á?¶á?·á??á?¬á?¸á??á??á?ºá??
+torbutton.popup.history.warning = Torbutton á??á??á?º á??á??á?°á??á?®á??á??á?·á?º Tor á?¡á??á?¼á?±á?¡á??á?±á??á??á?ºá??á?¯á??á?½á??á?º á??á?±á?«á?ºá??á?°á??á?¬á?¸á??á??á?·á?º á??á?»á??á?ºá??á?¾á?¬á??á?¬á??á??á?ºá??á?¯á??á?¾ á??á?¾á?¯á??á?ºá??á?¾á?¬á?¸á??á?¾á?¯á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?¬á?¸á??á??á?ºá??\n\ná??á??á?ºá?¸á??á?²á?·á??á?­á?¯á?· á??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸á??á??á?º Firefox á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?»á?¬á?¸ á??á??á??á??á??á?? á??á?¾á??á?·á?º á??á??á??á??á??á?? á??á??á?ºá?¸á??á?»á??á?ºá?? á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á??á?º á??á?¼á??á?ºá??á??á?ºá??\n\ná?¡á??á??á?ºá?? á??á??á?ºá?¸á??á?½á??á?·á?ºá??á?»á??á?®á?¸á??á?°á?¸á??á??á?º á?¡á??á?¼á?±á?¬á??á?ºá?¸á??á??á?¾á?­á??á?² á??á?±á?«á?ºá??á?¬á??á??á?ºá??á?¯ á??á??á?ºá??á?¼á??á?ºá??á?»á?¾á??á?º á??á??á?ºá?? á??á?»á??á?ºá??á?¾á?¬á??á?¬á??á?»á?¬á?¸á?¡á??á??á?º á??á??á?ºá??á?¯á??á??á?º á??á?±á?¬á??á?ºá??á?½á??á?ºá??á?¾ á??á?°á?·á??á?¬á??á?¬á??á?° á??á?¼á??á?ºá??á?½á?²á??á??á?ºá??á??á?º 
 á??á?¼á?­á?¯á??á??á?ºá?¸á??á?±á??á?¼á?®á?¸ á??á??á?ºá?¸á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?¬á?¸á??á??á?ºá??\n\ná??á??á?ºá?¸ Tor á?¡á??á?¼á?±á?¡á??á?±á??á?½á??á?º á??á?»á??á?ºá??á?¾á?¬á??á?¬á??á?­á?¯ á??á?¼á??á?ºá??á?½á?²á??á??á?ºá??á??á?º URL á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?ºá??á?±á??á?¬ á?¡á??á?½á??á?ºá??á?²á??á?½á??á?º 'enter' á??á??á?¯á??á?ºá??á?­á?¯ á??á?¾á?­á??á?ºá??á?«á??\n\n
+torbutton.popup.plugin.warning = Torbutton á??á??á?º á??á?¼á??á?·á?ºá??á?½á??á?ºá??á??á?­á?¯á??á??á??á?º á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á?? Tor á??á?­á?¯ á??á?­á?¯á??á?ºá??á?­á?¯á??á?ºá??á?½á?²á??á?°á??á?¼á??á?ºá?¸ á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á??á?ºá??\n\ná??á??á?ºá?¸á?¡á??á?¬á?¸ á??á?±á?¬á??á?ºá??á??á?ºá??á??á?ºá?¸á??á?¼á??á?·á?ºá??á?­á??á?ºá?¸á??á??á?º á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?«á??\n\n
+torbutton.popup.confirm_ca_certs = Torbutton á??á?¾á??á?ºá??á??á?º - á??á??á?·á?ºá??á?¶á??á?½á??á?º á?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯á??á??á?º á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?½á??á?·á?º á?¡á??á?»á?­á?¯á?¸á??á?»á?­á?¯á?¸ á??á??á?¾á?­á??á??á?º á??á?¯ á??á??á?ºá??á??á??á?ºá?? á?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯á??á??á?º á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?½á??á?·á?º á??á?¬á??á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?¼á??á?ºá?¸á??á??á?º á?¡á??á?½á??á?ºá??á?¾á?±á?¸á??á?½á?±á?¸á??á??á?·á?º á??á?¯á??á?ºá??á??á?ºá?¸á??á??á?ºá??á??á?ºá??á?¾á?¯á??á?¼á??á?ºá??á?¼á?®á?¸ Tor á?¡á??á?½á??á?·á?ºá?¡á??á?­á??á?ºá?¡á?¬á?¸ á??á?¾á?±á?¸á??á?½á?±á?¸á??á?½á?¬á?¸á??á?±á??á??á?ºá?? á?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯á??á??á?º á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?½á??á?·á?º á??á?®á?¸á??á??á?·á?ºá??á?¬á?¸á??á?¼á??á?ºá?¸á??á?­á?¯ á??á??á?ºá?? á??á?¼á??á?ºá??á?¼á?¯á??á?ºá??á?­á?¯á??á?«á??á??á?¬á?¸ ? (á?¡á??á??á?ºá?? á??á??á?ºá??á??á?º á??á??á?ºá?¸á??á?­á??á?¹á??á??á?­á?¯ á??á?¬á?¸á??á??á??á?ºá??á?«á??á?»á?¾á??á?º á
 ??á?±á?¬á??á?ºá?¸á??á?¼á?® á??á??á?¯á??á?ºá??á?­á?¯ á??á?¾á?­á??á?ºá??á??á?º á??á?­á??á?ºá??á?»á??á??á??á?ºá??)
+torbutton.popup.ff3.warning = á??á??á?­á??á?±á?¸á??á?»á??á?º!\n\nFirefox 3 á??á?¾ Torbutton á??á??á?º Tor á??á?¾á??á??á??á?·á?º á??á??á?ºá?? á?¡á??á?»á?­á??á?ºá??á?¯á??á?ºá??á?¾á??á?·á?º livemarks á??á?­á?¯á?·á??á?­á?¯ á??á?±á?«á??á?ºá??á?¼á?¬á?¸á??á?±á??á??á?ºá??á?¯ á??á?­á??á?¬á?¸á??á??á?ºá??\n\ná??á??á?ºá??á??á?º á??á??á?ºá??á??á?·á?ºá??á??á?ºá?¸á??á?¼á??á?·á?ºá??á??á?­á?¯ á??á??á?ºá??á?½á?¬á?¸á??á?­á?¯á??á?«á??á??á?¬á?¸á??
+torbutton.popup.toggle.warning = Tor á??á?­á?¯ á??á?­á??á?ºá??á?¼á?®á?¸ á??á?¼á??á?ºá??á?½á??á?·á?ºá??á??á?º á??á?­á?¯á?¡á??á?ºá??á??á?ºá?? á??á?­á?¯á?·á??á??á?¯á??á?ºá??á?«á?? á??á??á?ºá?? á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸ á?¡á??á??á?ºá??á??á?ºá??á??á?º á??á??á?ºá??á?­á?¯ á??á?¼á??á?ºá??á?½á??á?·á?ºá??á?«á??
+torbutton.popup.test.success = Tor á??á??á?±á?¬á??á?·á?ºá??á?®á??á??á?ºá??á?±á?¸á??á?¾á?¯ á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á??á?º!
+torbutton.popup.test.failure = Tor á??á??á?ºá??á?±á?¸á??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?« ! á??á??á?ºá?? á??á??á?±á?¬á??á?·á?ºá??á?® á??á?¾á??á?·á?º Polipo á??á??á??á?º á??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?«á??
+torbutton.popup.test.confirm_toggle = Tor á??á?­á?¯ á??á?¯á?¶á?¸á??á??á?º á??á??á?¼á?¬á??á?±á?¸á??á?®á?? Tor á??á??á?±á?¬á??á?·á?ºá??á?® á??á??á?ºá??á?±á?¸á??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??\n\ná??á??á?ºá??á??á?·á?ºá??á??á?ºá?¸á??á??á?ºá?¸á??á?¼á??á?·á?ºá??á??á?­á?¯ á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá?¡á?±á?¬á??á?º á??á?¯á??á?ºá??á?»á??á?ºá??á??á?ºá??á?¾á?¬ á??á?±á??á?»á?¬á??á?«á??á??á?¬á?¸?\n\ná??á?¾á??á?ºá??á??á?º - á?¡á??á??á?ºá?? á??á??á?ºá??á??á?º á??á?¼á?¿á??á?¬á??á?­á?¯ á??á?¼á??á?ºá??á??á?ºá??á?­á?¯á??á?«á??á?»á?¾á??á?º á??á??á?ºá??á??á?º á??á??á?¯ á??á??á?­á??á?±á?¸á??á?»á??á?ºá??á?­á?¯ á??á??á?ºá??á?¾á?¬á?¸á??á??á?ºá??á??á?º Torbutton á??á??á?±á?¬á??á?·á?ºá??á?® á??á?­á?¯á??á?¬á?¸á??á?»á??á?ºá??á?»á?¬á?¸ á??á??á?ºá?¸á??á?­á?¯á?¸á??á?²á??á?¾á?­ á??á??á?ºá??á?±á?¸á??á?¾á?¯á??á?­á?¯á?· á??á?¼á??á?ºá??á?½á?¬á?¸á??á?­á?¯á??á?ºá??á??á?ºá??
+torbutton.popup.test.ff3_notice = Tor á??á??á?±á?¬á??á?·á?ºá??á?®á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á??á?º á??á?±á?¬á??á?ºá?¸á??á?¼á?®á??á?­á?¯ á??á?¾á?­á??á?ºá??á?«á?? á??á??á?ºá?¸á??á??á?ºá??á?±á?¸á??á?¾á?¯á??á??á?º á??á?±á?¬á??á?ºá??á?½á??á?ºá??á?¾ á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?½á?¬á?¸á??á?­á??á?·á?ºá??á??á?ºá?? á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á?­á??á?ºá??á?¾á??á?ºá??á?±á?¸á??á?«á??
+torbutton.panel.label.verified = Tor á?¡á??á??á?ºá??á?¼á?¯á??á?¼á?®á?¸ á??á?¼á??á?ºá??á??á?ºá??
+torbutton.popup.test.auto_failed = Tor á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?º Tor á??á??á?±á?¬á??á?·á?ºá??á?® á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á??á?ºá??á?±á?¸á??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??\n\ná??á??á?ºá??á??á?º á??á??á?ºá??á??á?·á?ºá??á??á?ºá?¸á??á?¼á??á?·á?ºá??á??á?­á?¯ á??á?¡á?±á?¬á??á?ºá??á?¯á??á?ºá??á?»á??á?ºá??á??á?ºá??á?¾á?¬ á??á?±á??á?»á?¬á??á?«á??á??á?¬á?¸á??
+torbutton.prefs.recommended = (á?¡á??á?¼á?¶á??á?¼á?¯á??á?¬á?¸á??á??á?º)
+torbutton.prefs.optional = (á??á?¾á??á?ºá??á??á?ºá??á?¬)
+torbutton.prefs.crucial = (á?¡á??á?½á??á?ºá?¡á??á?±á?¸á??á?«)
+torbutton.popup.external.title = á??á?¼á??á?ºá??á??á?¾ á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?½á?²á??á?°á??á??á?ºá??á?¬á?¸?
+torbutton.popup.external.app = á??á??á?ºá?¸á??á?­á?¯ á??á?­á?¯á??á?ºá??á?½á??á?ºá??á?¼á?±á??á?¾á??á?ºá?¸á??á??á?º á??á?¼á??á?ºá??á?¡á??á?¯á?¶á?¸á??á?»á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?­á?¯ á??á?­á?¯á?¡á??á?ºá??á??á?º - \n\n
+torbutton.popup.external.note = \n\ná??á?¾á??á?ºá??á??á?º - á??á?¼á??á?ºá??á??á?¾ á?¡á??á?¯á?¶á?¸á??á?»á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á??á?º á??á?¯á?¶á??á?¾á??á?ºá?¡á?¬á?¸á??á?¼á??á?·á?º Tor á?¡á?¬á?¸ á??á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á??á?«á?? á??á??á?·á?ºá?¡á?¬á?¸ Unmask á??á?¼á??á?ºá??á?±á??á??á?ºá??\n
+torbutton.popup.external.suggest = \ná?¡á??á??á?ºá?? á??á??á?ºá?¸á??á?­á?¯á??á?ºá??á?­á?¯ á??á?¯á?¶á??á?¼á??á?ºá??á?­á??á?ºá??á??á?»á??á??á?»á?¾á??á?º á?¡á??á?ºá??á?¬á??á?­á?¯á??á?ºá?¸á??á?¼á??á?ºá??á??á?»á?­á??á?º á??á?­á?¯á?·á??á??á?¯á??á?º VM á??á??á?ºá??á?¯á?¡á??á?²á??á?½á??á?º á??á?¾á?­á??á?»á?­á??á?ºá??á?­á?¯á?·á??á?½á??á?º á??á?¼á??á?·á?ºá??á??á?º á??á??á?ºá?¸á??á?­á?¯á??á?ºá??á?­á?¯ á??á?ºá??á?ºá?? á??á?­á??á?ºá?¸á??á?¬á?¸á??á??á??á?ºá?? \ná??á?­á?¯á?·á??á??á?¯á??á?ºá??á?«á??á??á??á?ºá?¸ Tails LiveCD á??á?­á?¯á?·á??á??á?¯á??á?º torsock á??á?­á?¯á?·á??á?²á?·á??á?­á?¯á?· á??á??á?ºá??á?¬á??á?¼á??á?ºá??á?¬á??á?¾á?­á??á??á?·á?º Tor á??á??á?±á?¬á??á?·á?ºá??á?®á??á?­á?¯ á??á?¯á?¶á?¸á??á?¼á??á?·á?ºá??á??á??á?ºá??\n
+torbutton.popup.launch = á?¡á??á?¯á?¶á?¸á??á?»á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?­á?¯ á?¡á??á??á?¼á?¯á?? á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?ºá??
+torbutton.popup.cancel = á??á??á?ºá??á?»á??á?ºá??á?«á??
+torbutton.popup.dontask = á??á??á?ºá??á?±á??á?¬á??á?¾á??á?? á?¡á??á?¯á?¶á?¸á??á?»á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?¼á?²á??á??á?ºá?¸ á?¡á??á??á?¼á?¯á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á?«á??
+torbutton.popup.test.no_http_proxy = Tor á??á??á?±á?¬á??á?·á?ºá??á?® á??á??á?ºá??á?±á?¸á??á?¾á?¯ - á??á?­á?¯á??á??á?º HTTP á??á??á?±á?¬á??á?·á?ºá??á?® á??á?­á?¯ á??á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?«á?? Polipo á??á?±á?¬á??á?ºá?¸á??á?½á?¬ á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?«á??á??á?¬á?¸?
+torbutton.popup.captcha.title = Google Captchas á??á??á?­á?¯á??á??á??á?ºá??á?­á?¯ á??á??á?¯á??á?ºá??á?»á??á?ºá??á?°á?¸á??á?¬á?¸?
+torbutton.popup.captcha.ask = Torbutton á??á??á?º Google Captcha á??á??á?­á?¯á??á??á??á?ºá??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?½á?±á?·á??á?¾á?­á??á?±á??á??á?ºá?? 
+torbutton.popup.captcha.always = á??á??á?ºá??á?±á??á?¬á??á?¾á??á?? á??á??á?ºá??á?¾á?¯á??á?ºá??á?¾á?¬á?¸á??á?¾á?¯á??á?­á?¯ á?¡á??á?¼á?²á??á??á?ºá?¸ á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?«á??
+torbutton.popup.redirect = á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?«á??
+torbutton.popup.no_redirect = á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?¼á?±á?¬á??á?ºá?¸á??á?«á??
+torbutton.popup.prompted_language = á??á??á?ºá?? á??á?¯á??á?¹á??á??á?­á??á??á?¯á?¶á??á?¼á?¯á?¶á??á?¾á?¯á??á?­á?¯ á??á?­á?¯á??á?­á?¯ á??á??á?¾á?­á??á??á?º á??á??á?ºá??á?ºá??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á?? á?¡á??á?ºá?¹á??á??á?­á??á?ºá??á?¬á??á?¬á??á??á?¬á?¸á??á?¬á?¸á??á?¾á??á?ºá?¸á??á?­á?¯ Torbutton á?? á??á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?­á?¯á??á?ºá??á??á?ºá?? á??á??á?ºá?¸á??á?­á?¯á?·á??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸á??á??á?º á?¡á??á?ºá?¹á??á??á?­á??á?ºá??á?¬á??á?¬á??á??á?¬á?¸á??á?¼á??á?·á?ºá??á??á?ºá?? á??á??á?ºá?? á??á?­á??á??á?ºá??á?¬á??á?¬á??á??á?¬á?¸á??á?¼á??á?·á?º á??á??á?ºá??á?­á?¯á??á??á?·á?º á??á??á?ºá??á?ºá??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á??á??á?ºá?¸á??á?­á?¯á?·á??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸á??á??á?º á??á??á?ºá??á?ºá??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?ºá?¹á??á??á?­á??á?ºá??á?¬á??á?¬á??á??á?¬á?¸á??á?¼á??á?·á?º á??á?¼á??á??á??á?·á?ºá?¡á??á?¬á?¸ á??á??á?ºá?? á??á?­á??á??á?ºá??á?¬á??á?¬á??á??á?¬á?¸á??á?¼á??á?·á?º á??á??á?ºá??á?­
 á?¯á?·á??á??á?±á??á??á?º 
+torbutton.popup.no_newnym = Torbutton á??á??á?º á??á??á?·á?ºá?¡á?¬á?¸ á?¡á?­á?¯á??á?ºá??á?®á?¡á??á??á?ºá??á?­á?¯ á??á?¯á?¶á??á?¼á?¯á?¶á??á?­á??á?ºá??á?»á??á??á?½á?¬ á??á??á?±á?¸á??á?­á?¯á??á?ºá??á?«á?? á??á??á?ºá?¸á??á??á?º Tor á??á?­á??á?ºá?¸á??á?»á?¯á??á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?­á?¯á?· á??á??á??á?ºá??á?±á?¬á??á?ºá??á?«á??\n\ná??á??á?ºá??á??á?º Tor á??á??á?±á?¬á??á?·á?ºá??á?¬ á?¡á??á?¯á?¡á??á?±á?¸á??á?­á?¯ á??á?½á??á?·á?ºá??á?¬á?¸á??á?«á??á??á?¬á?¸ ?
+torbutton.popup.use_tbb = á??á??
+torbutton.popup.pref_error = Tor á??á?¼á??á?·á?ºá??á?¾á?¯á??á??á?­á?¯á??á??á??á?º  á??á??á?­á?¯á??á?­á?¯á??á?º á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?½á??á?º á??á?­á?¯á??á?¬á?¸á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ Torbutton á?? á?¡á??á??á?·á?ºá??á??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?±á?¸á??á?­á?¯á??á?ºá??á?«á??
+torbutton.popup.permission_denied = á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? Tor á??á?¼á??á?·á?ºá??á?¾á?¯á??á??á?­á?¯á??á??á??á?º á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á?? á??á?½á??á?·á?ºá??á?¼á?¯á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¼á??á?ºá??á??á?º á??á??á?ºá??á?¾á??á?ºá??á?«á?? á??á?­á?¯á?·á??á??á?¯á??á?ºá??á?«á?? Tor á??á?¼á??á?·á?ºá??á?¾á?¯á??á??á?­á?¯á??á??á??á?º á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?±á??á?¬á?¡á??á??á?ºá??á?­á?¯á?· á??á?°á?¸á??á?°á??á?«á??
+torbutton.popup.device_full = á??á?­á?¯á??á?¾á?±á?¬á??á?ºá??á??á?º á??á?±á??á?¬á??á?¼á??á?·á?ºá??á?±á??á??á?ºá??á?¯á??á??á?ºá??á??á??á?ºá?? á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á?­á?¯á??á?¾á?±á?¬á??á?ºá??á??á?ºá??á?±á??á?¬á??á?½á??á?ºá?¡á?±á?¬á??á?ºá??á?¯á??á?ºá??á?«á?? á??á?­á?¯á?·á??á??á?¯á??á?º á??á??á?ºá?¡á??á??á?ºá??á?­á?¯á?· Tor á??á?¼á??á?·á?ºá??á?¾á?¯á??á??á?­á?¯á??á??á??á?º á??á?­á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á?½á?±á?·á??á?«á??
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/nah/torbutton.dtd
+++ b/src/chrome/locale/nah/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/nah/torbutton.properties b/src/chrome/locale/nah/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/nah/torbutton.properties
+++ b/src/chrome/locale/nah/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/nap/torbutton.dtd
+++ b/src/chrome/locale/nap/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/nap/torbutton.properties b/src/chrome/locale/nap/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/nap/torbutton.properties
+++ b/src/chrome/locale/nap/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index 1df1f30..7fd5f1c 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ne/torbutton.dtd
+++ b/src/chrome/locale/ne/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ne/torbutton.properties b/src/chrome/locale/ne/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ne/torbutton.properties
+++ b/src/chrome/locale/ne/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index e4f60b5..611807a 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = Het lijkt er op dat je Torbutton met Firefox gebruikt,
 torbutton.popup.pref_error = Torbutton kan instellingen niet bijwerken in de Tor Browser profiel folder.
 torbutton.popup.permission_denied = Stel de rechten van de Tor Browser folder opnieuw in of kopieer deze naar een nieuwe lokatie.
 torbutton.popup.device_full = De schijf lijkt vol te zijn. Maak ruimte vrij of verplaats Tor Browser naar een nieuw apparaat.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/nn/torbutton.dtd
+++ b/src/chrome/locale/nn/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/nn/torbutton.properties b/src/chrome/locale/nn/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/nn/torbutton.properties
+++ b/src/chrome/locale/nn/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/nso/torbutton.dtd
+++ b/src/chrome/locale/nso/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/nso/torbutton.properties b/src/chrome/locale/nso/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/nso/torbutton.properties
+++ b/src/chrome/locale/nso/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/oc/torbutton.dtd
+++ b/src/chrome/locale/oc/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/oc/torbutton.properties b/src/chrome/locale/oc/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/oc/torbutton.properties
+++ b/src/chrome/locale/oc/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/or/torbutton.dtd
+++ b/src/chrome/locale/or/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/or/torbutton.properties b/src/chrome/locale/or/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/or/torbutton.properties
+++ b/src/chrome/locale/or/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/pa/torbutton.properties b/src/chrome/locale/pa/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/pa/torbutton.properties
+++ b/src/chrome/locale/pa/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/pap/torbutton.dtd
+++ b/src/chrome/locale/pap/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/pap/torbutton.properties b/src/chrome/locale/pap/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/pap/torbutton.properties
+++ b/src/chrome/locale/pap/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index be9f528..b08c088 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = WyglÄ?da na to, że używasz Torbuttona z Firefoksem,
 torbutton.popup.pref_error = Torbutton nie może zaktualizowaÄ? preferencji w katalogu profilowym PrzeglÄ?darki Tora.
 torbutton.popup.permission_denied = ProszÄ? albo ponownie ustawiÄ? uprawnienia do katalogu PrzeglÄ?darki Tora albo skopiowaÄ? go w nowe miejsce.
 torbutton.popup.device_full = Dysk zdaje siÄ? byÄ? peÅ?ny. ProszÄ? zwolniÄ? miejsce lub przenieÅ?Ä? PrzeglÄ?darkÄ? Tora na nowe urzÄ?dzenie.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/pms/torbutton.dtd
+++ b/src/chrome/locale/pms/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/pms/torbutton.properties b/src/chrome/locale/pms/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/pms/torbutton.properties
+++ b/src/chrome/locale/pms/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ps/torbutton.dtd
+++ b/src/chrome/locale/ps/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ps/torbutton.properties b/src/chrome/locale/ps/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ps/torbutton.properties
+++ b/src/chrome/locale/ps/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index ac939c6..5611b9a 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -24,7 +24,7 @@ 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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nSe este arquivo não é confiável, você deveria salvá-lo para vê-lo quando estiver offline ou usando uma MV,\nou considere usar um proxy Tor transparente como o Tails LiveCD ou torsocks.\n
 torbutton.popup.launch = Rode a aplicação
 torbutton.popup.cancel = Cancelado
 torbutton.popup.dontask = Sempre ative aplicações a partir de agora
@@ -34,9 +34,12 @@ torbutton.popup.captcha.ask = Torbuttor detecetou um Google Captcha. Você gosta
 torbutton.popup.captcha.always = Sempre realizar esta ação de agora em diante
 torbutton.popup.redirect = Redirecionar
 torbutton.popup.no_redirect = Não redirecionar
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Para proporcionar mais privacidade a você, o Torbutton pode requisitar a versão em inglês de páginas da web. Isso pode fazer com que páginas que você prefere ler na sua língua nativa apareçam em Inglês.
+torbutton.popup.no_newnym = O Torbutton não pode te dar uma nova identidade com segurança. Ele não tem acesso à Porta de Controle Tor.\n\\n\nVocê está usando o Tor Browser Bundle?
+torbutton.popup.use_tbb = Parece que você está usando o Torbutton com o Firefox, que não é mais uma configuração segura recomendada.\n\nEm vez disso, recomendamos que obtenha a versão mais recente do Tor Browser Bundle, enviando um e-mail para gettor@xxxxxxxxxxxxxx ou fazendo o download no seguinte endereço:
+torbutton.popup.pref_error = O Torbutton não pode atualizar as preferências na pasta de perfil do Tor Browser.
+torbutton.popup.permission_denied = Por favor, restaure as permissões da pasta do Tor browser ou copie-a para um outro lugar.
+torbutton.popup.device_full = Este disco parece estar cheio. Por favor, libere espaço ou mova o Tor Browser para um novo dispositivo.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index a1eabb0..696d246 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -16,18 +16,18 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Porto:">
 <!ENTITY torbutton.about.title "Sobre o Torbutton">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
+<!ENTITY torbutton.about.version "Versão:">
+<!ENTITY torbutton.about.summary "Protege a privacidade da navegação do Tor.">
+<!ENTITY torbutton.about.code "Contribuidores de Código:">
+<!ENTITY torbutton.about.maintainer "Mantenedor:">
+<!ENTITY torbutton.about.security_review "Revisão de Segurança:">
+<!ENTITY torbutton.about.donate "Se gosta de usar o Tor, poderá considerar">
+<!ENTITY torbutton.about.make_donation "fazer uma doação">
 <!ENTITY torbutton.pref_connection.notice "Desactivar o Torbutton para mudar estas configurações.">
 <!ENTITY torbutton.pref_connection.more_info "Mais informações">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo. Se deseja mudar as configurações de Proxy que não sejam do Tor, por favor desactive o Torbutton e volte aqui. Se deseja alterar as configurações do Tor, por favor, use a janela de preferências do Torbutton.">
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity "Identidade Nova">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.toggle "Alterar Status Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
@@ -35,13 +35,13 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Sobre o Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "Proteções de Cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.copyTor "Copiar endereço do Tor">
+<!ENTITY torbutton.context_menu.copyTor.key "P">
+<!ENTITY torbutton.context_menu.openTorTab "Abrir endereço do Tor numa nova Aba">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "Abrir endereço do Tor numa nova página">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton">
@@ -54,7 +54,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Bloquear a cópia local e limpar todos as cópias ao alterar o uso do Tor">
 <!ENTITY torbutton.prefs.block_cache "Bloquear cache de memória e disco durante o uso do Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies não-Tor num local protegido">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.cookie_protection "Usar a caixa de diálogo das Proteções dos Cookies para escolher">
 <!ENTITY torbutton.prefs.mmm_cookies "Eu manualmente administrarei os meus cookies (perigoso)">
 <!ENTITY torbutton.prefs.clear_cookies "Limpar cookies quando alterar a utilização do Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Desactivar plugins durante a utilização do Tor (importante)">
@@ -74,9 +74,9 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Desactivar a função de salvar sessão (recomendado)">
 <!ENTITY torbutton.prefs.headers "Cabeçalho">
 <!ENTITY torbutton.prefs.spoof_english "Mimetizar o navegador para Inglês dos EUA">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.refererspoofing "Falsificação do referente">
 <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.smartspoof "Falsificação inteligente do referente durante o uso do Tor (falsifica referentes de domínios cruzados)">
 <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Desactivar o armazenamento DOM durante o uso do Tor (crucial)">
 <!ENTITY torbutton.prefs.forms "Formulários">
@@ -85,7 +85,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Não-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Na sessão restaurada, ajustar o estado do Tor para:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "No arranque do Browser, acertar o estado do Tor para:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar cookies/limpar cookies em caso de falha do Firefox (recomendado)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Armazene os cookies, sejam ou não do Tor, em recipientes protegidos (perigoso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Limpar as sessões HTTP autenticadas (recomendado)">
@@ -115,33 +115,33 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!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.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
-<!ENTITY torbutton.cookiedialog.nameCol "Name">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.spoofreresh "Refrescamento da falsificação">
+<!ENTITY torbutton.prefs.refereroptions "Opções de falsificação do referente">
+<!ENTITY torbutton.prefs.nospoof "Não falsificar referente">
+<!ENTITY torbutton.prefs.spoofroot "Falsificar a pasta que contém a página">
+<!ENTITY torbutton.prefs.spoofdomain "Falsificar o domínio com o referente">
+<!ENTITY torbutton.prefs.spoofblank "Limpar referente">
+<!ENTITY torbutton.cookiedialog.title "Gerir as Proteções dos Cookies">
+<!ENTITY torbutton.cookiedialog.lockCol "Protegido">
+<!ENTITY torbutton.cookiedialog.domainCol "Anfitrião">
+<!ENTITY torbutton.cookiedialog.nameCol "Nome">
+<!ENTITY torbutton.cookiedialog.pathCol "Caminho">
+<!ENTITY torbutton.cookiedialog.protectCookie "Proteger Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remover Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remover todos excepto os Protegidos">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger os novos Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não proteger os novos Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Desactivar actualizações durante a utilização do Tor">
 <!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.update_torbutton_via_tor "Redirect Torbutton actualiza-se através do Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Usar automaticamente um motor de busca alternativo quando lhe for apresentado um Captcha Google:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.fix_google_srch "Retirar plataforma e língua dos pedidos da caixa de pesquisa do Google">
+<!ENTITY torbutton.prefs.transparentTor "Torificação transparente (Necessita transpoxy customizado ou router Tor)">
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index 6f4c1b5..bbdf04f 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties
index a9600fa..950e1f8 100644
--- a/src/chrome/locale/ro/torbutton.properties
+++ b/src/chrome/locale/ro/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial = (critic)
 torbutton.popup.external.title = SÄ? încarc conÈ?inutul extern?
 torbutton.popup.external.app = O aplicaÅ£ie externÄ? este necesarÄ? sÄ? se ocupe de:\n\n
 torbutton.popup.external.note = \n\nObservatie: Aplicatiile externe NU sunt sigure cu setÄ?rile implicite Tor, Å?i vÄ? pot demasca!\n
-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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nDaca fisierul nu este de incredere, ar trebui fie sa il salvati in vederea unei vizualizari in modul offline sau Masina Virtuala, sau sa luati in considerare utilizarea unui proxy Tor transparent cum ar fi Tails LiveCD sau torsocks\n
 torbutton.popup.launch = PorneÈ?te aplicaÈ?ia
 torbutton.popup.cancel = Anulare
 torbutton.popup.dontask = Ã?ntotdeauna lanseazÄ? aplicaÅ£ii de acum încolo
@@ -34,9 +34,12 @@ torbutton.popup.captcha.ask = Torbutton a detectat un captcha Google.DoreÅ?ti sa
 torbutton.popup.captcha.always = Se ca efectua întotdeauna aceastÄ? acÅ£iune de acum încolo
 torbutton.popup.redirect = RedirecÅ£ioneazÄ?
 torbutton.popup.no_redirect = Nu Redirecţiona
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Pentru a va asigura o confidentialitate sporita, Torbutton poate solicita versiunea in limba engleza a paginilor web. Acest lucru poate determina afisarea in limba engleza a paginilor pe care ati fi dorit sa le cititi in limba dumneavoastra natala.\n\nDoriti sa solicitati versiunea in limba engleza a paginilor web pentru a va bucura de o confidentialitate sporita ?
+torbutton.popup.no_newnym = Torbutton nu va poate oferi in siguranta o noua identitate. Nu are acces la Tor Control Port\n\nSunteti sigur ca utilizati Tor Browser Bundle?
+torbutton.popup.use_tbb = Se pare ca utilizati Torbutton împreunÄ? cu Firefox, ceea ce nu mai este recomandatÄ? ca fiind o configuratie sigurÄ?.\n\nIn schimb, va recomandam sa obtineti ultima versiune a Tor Browser Bundle trimitand un email la: gettor@xxxxxxxxxxxxxx sau prin descarcarea acesteia de la urmatoarea adresa URL: 
+torbutton.popup.pref_error = Torbutton nu poate actualiza preferintele in directorul de profile al Tor Bowser.
+torbutton.popup.permission_denied = Va rugam fie sa resetati permisiunile directorului Tor Browser fie sa il copiati intr-o locatie noua.
+torbutton.popup.device_full = Discul pare sa fie plin. Va rugam sa asigurati mai mult spatiu liber pe disc sau sa mutati Tor browser pe un nou dispozitiv.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index b884c2d..7b6189d 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -16,19 +16,19 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ñ?оÑ?Ñ?:">
 <!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
 <!ENTITY torbutton.about.title "СпÑ?авка">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
+<!ENTITY torbutton.about.version "Ð?еÑ?Ñ?иÑ?:">
+<!ENTITY torbutton.about.summary "Ð?аÑ?иÑ?аеÑ? конÑ?иденÑ?иалÑ?ноÑ?Ñ?Ñ? ваÑ?его пÑ?оÑ?моÑ?Ñ?а Ñ?Ñ?Ñ?аниÑ? Ñ?еÑ?ез Tor.">
+<!ENTITY torbutton.about.code "Ð?вÑ?оÑ?Ñ? пÑ?огÑ?аммÑ?:">
+<!ENTITY torbutton.about.maintainer "СопÑ?овождение:">
+<!ENTITY torbutton.about.security_review "Ð?бзоÑ? безопаÑ?ноÑ?Ñ?и:">
+<!ENTITY torbutton.about.donate "Ð?Ñ?ли вам нÑ?авиÑ?Ñ?Ñ? иÑ?полÑ?зоваÑ?Ñ? Tor, вÑ? можеÑ?е">
+<!ENTITY torbutton.about.make_donation "Ñ?делаÑ?Ñ? пожеÑ?Ñ?вование.">
 <!ENTITY torbutton.pref_connection.notice "Ð?лÑ? изменениÑ? наÑ?Ñ?Ñ?оек необÑ?одимо оÑ?клÑ?Ñ?иÑ?Ñ? Torbutton.">
 <!ENTITY torbutton.pref_connection.more_info "Ð?одÑ?обноÑ?Ñ?и">
 <!ENTITY torbutton.pref_connection_more_info.title "Ð?одÑ?казка">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton вклÑ?Ñ?ен.  Ð?Ñ?ли бÑ?дÑ?Ñ? изменÑ?Ñ?Ñ?Ñ?Ñ? наÑ?Ñ?Ñ?ойки пÑ?окÑ?и, не Ñ?влÑ?Ñ?Ñ?егоÑ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? Ñ?еÑ?и Tor, необÑ?одимо Ñ?наÑ?ала оÑ?клÑ?Ñ?иÑ?Ñ? Torbutton и заÑ?ем веÑ?нÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?да.  Ð?Ñ?ли бÑ?дÑ?Ñ? изменÑ?Ñ?Ñ?Ñ?Ñ? наÑ?Ñ?Ñ?ойки Tor, необÑ?одимо иÑ?полÑ?зоваÑ?Ñ? окно наÑ?Ñ?Ñ?оек Torbutton.">
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
-<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!ENTITY torbutton.context_menu.new_identity "Ð?оваÑ? лиÑ?ноÑ?Ñ?Ñ?">
+<!ENTITY torbutton.context_menu.new_identity_key "Я">
 <!ENTITY torbutton.context_menu.toggle "Ð?змениÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Ð?аÑ?Ñ?Ñ?ойки...">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index a3cdac4..30221c8 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -24,7 +24,7 @@ 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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nÐ?Ñ?ли к Ñ?Ñ?омÑ? Ñ?айлÑ? неÑ? довеÑ?иÑ?, вÑ? должнÑ? либо Ñ?оÑ?Ñ?аниÑ?Ñ? его на диÑ?к длÑ? пÑ?оÑ?моÑ?Ñ?а пÑ?и вÑ?клÑ?Ñ?енном доÑ?Ñ?Ñ?пе к Ñ?еÑ?и или в виÑ?Ñ?Ñ?алÑ?ной маÑ?ине,\nили Ñ?аÑ?Ñ?моÑ?Ñ?еÑ?Ñ? возможноÑ?Ñ?Ñ? иÑ?полÑ?зованиÑ? пÑ?озÑ?аÑ?ного Tor пÑ?окÑ?и Ñ?ипа Tails LiveCD или torsocks.\n
 torbutton.popup.launch = Ð?апÑ?Ñ?Ñ?иÑ?Ñ? пÑ?иложение
 torbutton.popup.cancel = Ð?Ñ?мениÑ?Ñ?
 torbutton.popup.dontask = Ð? бÑ?дÑ?Ñ?ем вÑ?егда запÑ?Ñ?каÑ?Ñ? пÑ?иложениÑ?
@@ -34,9 +34,12 @@ torbutton.popup.captcha.ask = Torbutton обнаÑ?Ñ?жил Google Captcha. Ð?е
 torbutton.popup.captcha.always = Ð? бÑ?дÑ?Ñ?ем вÑ?егда запÑ?Ñ?каÑ?Ñ? пÑ?иложениÑ?
 torbutton.popup.redirect = Ð?еÑ?енапÑ?авиÑ?Ñ?
 torbutton.popup.no_redirect = Ð?е пеÑ?енапÑ?авлÑ?Ñ?Ñ?
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Ð?лÑ? пÑ?едоÑ?Ñ?авлениÑ? болÑ?Ñ?ей пÑ?иваÑ?ноÑ?Ñ?и, Torbutton можеÑ? запÑ?аÑ?иваÑ?Ñ? веÑ?Ñ?ии Ñ?Ñ?Ñ?аниÑ? на английÑ?ком Ñ?зÑ?ке. ЭÑ?о можеÑ? повлеÑ?Ñ? оÑ?обÑ?ажение Ñ?Ñ?Ñ?аниÑ? на английÑ?ком Ñ?зÑ?ке, вмеÑ?Ñ?о оÑ?обÑ?ажениÑ? иÑ? на ваÑ?ем Ñ?одном Ñ?зÑ?ке.\n\nХоÑ?иÑ?е запÑ?аÑ?иваÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ? на английÑ?ком Ñ?зÑ?ке длÑ? болÑ?Ñ?ей пÑ?иваÑ?ноÑ?Ñ?и?
+torbutton.popup.no_newnym = Torbutton не можеÑ? безопаÑ?но даÑ?Ñ? вам новÑ?Ñ? лиÑ?ноÑ?Ñ?Ñ?. Ð?н не имееÑ? доÑ?Ñ?Ñ?па к Tor Control Port.\n\nÐ?Ñ? иÑ?полÑ?зÑ?еÑ?е Tor Browser Bundle?
+torbutton.popup.use_tbb = Ð?оÑ?оже, Ñ?Ñ?о вÑ? иÑ?полÑ?зÑ?еÑ?е Torbutton и Firefox, Ñ?Ñ?о более не Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?екомендÑ?емой безопаÑ?ной конÑ?игÑ?Ñ?аÑ?ией.\n\nÐ?меÑ?Ñ?о Ñ?Ñ?ого, мÑ? Ñ?екомендÑ?ем вам полÑ?Ñ?иÑ?Ñ? поÑ?ледний Tor Browser Bundle оÑ?оÑ?лав email на gettor@xxxxxxxxxxxxxx или Ñ?каÑ?ав его по Ñ?ледÑ?Ñ?Ñ?ей Ñ?Ñ?Ñ?лке: 
+torbutton.popup.pref_error = Torbutton не можеÑ? обновиÑ?Ñ? наÑ?Ñ?Ñ?ойки в папке пÑ?оÑ?илÑ? Tor Browser.
+torbutton.popup.permission_denied = Ð?ожалÑ?йÑ?Ñ?а, либо Ñ?бÑ?оÑ?Ñ?Ñ?е Ñ?азÑ?еÑ?ениÑ? длÑ? папки Tor Browser или Ñ?копиÑ?Ñ?йÑ?е еÑ? в дÑ?Ñ?гое меÑ?Ñ?о.
+torbutton.popup.device_full = Ð?оÑ?оже, Ñ?Ñ?о диÑ?к заполнен. Ð?ожалÑ?йÑ?Ñ?а, оÑ?вободиÑ?е меÑ?Ñ?о или пеÑ?емеÑ?Ñ?иÑ?е Tor Browser на дÑ?Ñ?гой диÑ?к.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/sco/torbutton.dtd
+++ b/src/chrome/locale/sco/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sco/torbutton.properties b/src/chrome/locale/sco/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/sco/torbutton.properties
+++ b/src/chrome/locale/sco/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/sk/torbutton.dtd
+++ b/src/chrome/locale/sk/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sk/torbutton.properties b/src/chrome/locale/sk/torbutton.properties
index 773e8db..111b270 100644
--- a/src/chrome/locale/sk/torbutton.properties
+++ b/src/chrome/locale/sk/torbutton.properties
@@ -1,11 +1,11 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
+torbutton.button.tooltip.disabled = Zapnúť Tor
+torbutton.button.tooltip.enabled = Vypnúť Tor
+torbutton.panel.tooltip.disabled = Kliknite pre zapnutie Tor
+torbutton.panel.tooltip.enabled = Kliknite pre vypnutie Tor
+torbutton.panel.plugins.disabled = Kliknite pre zapnutie rozšírení
+torbutton.panel.plugins.enabled = Kliknite pre vypnutie rozšírení
+torbutton.panel.label.disabled = Tor vypnutý
+torbutton.panel.label.enabled = Tor zapnutý
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
@@ -18,9 +18,9 @@ torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to u
 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.prefs.recommended = (odporúÄ?ané)
+torbutton.prefs.optional = (voliteľné)
+torbutton.prefs.crucial = (kritické)
 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
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 4ca1008..28d9589 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -21,7 +21,7 @@
 <!ENTITY torbutton.about.code "Code Contributors:">
 <!ENTITY torbutton.about.maintainer "Maintainer:">
 <!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.donate "Ä?e vam je Tor vÅ¡eÄ?, vas bo morda zanimalo tudi:">
 <!ENTITY torbutton.about.make_donation "doniraj">
 <!ENTITY torbutton.pref_connection.notice "Ä?e želite spremeniti te nastavitve onemogoÄ?ite razÅ¡iritev Torbutton.">
 <!ENTITY torbutton.pref_connection.more_info "VeÄ? informacij">
@@ -85,7 +85,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ne-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ob zaÄ?etku obnovljene seje nastavi Tor na:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "Ob zagonu brskalnika nastavi stanje Tor-a 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)">
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sl/torbutton.properties b/src/chrome/locale/sl/torbutton.properties
index e8f7a4d..0863194 100644
--- a/src/chrome/locale/sl/torbutton.properties
+++ b/src/chrome/locale/sl/torbutton.properties
@@ -10,14 +10,14 @@ extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton razši
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton obvestilo: Zdi se da nimate prirejenih dovoljenj za certifikate. pregledovanje dovoljenj za certifikate je poÄ?asno in upoÄ?asni preklop Tor-a. bi radi onemogoÄ?ili izloÄ?evanje certifikata za dovoljenje certifikatov? (Ä?e tega ne razumete, je varno da pritisnete OK)
-torbutton.popup.ff3.warning = 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.ff3.warning = Opozorilo!\nTorbutton s Firefoxom verzijo 3 lahko v omrežje Tor izdaja vaÅ¡e podatke o Ä?asovnem pasu.\nŽelite vseeno nadaljevati?
 torbutton.popup.toggle.warning = Potrebno je preklopiti Tor oziroma ponovno zagnati da bodo nove nastavitve sprejete.
 torbutton.popup.test.success = Tor proxy test je uspešen!
 torbutton.popup.test.failure = Tor proxy test NI USPEÅ EN! preveri svoje poroxy in Polipo nastavitve.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = pritisni OK da preveriš Tor proxy nastavitve. Test se bo izvajal v ozadju. Bodite potrpežljivi
+torbutton.popup.test.ff3_notice = pritisni OK da preverite Tor proxy nastavitve. Test se bo izvajal v ozadju. Bodite potrpežljivi
 torbutton.panel.label.verified = Tor preverjen
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.popup.test.auto_failed = Samodejni test Tor proxy nastavitve ni uspel.\nJo želite vseeno uporabiti?
 torbutton.prefs.recommended = (priporoÄ?eno)
 torbutton.prefs.optional = (neobvezno)
 torbutton.prefs.crucial = (obvezno)
@@ -31,12 +31,15 @@ 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
+torbutton.popup.captcha.always = Zapomni si mojo odloÄ?itev
+torbutton.popup.redirect = Preusmeri
+torbutton.popup.no_redirect = Ne preusmeri
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
 torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.device_full = Na disku ni veÄ? prostora. Naredite prostor ali premaknite Tor brskalnik na drugo napravo.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/so/torbutton.dtd
+++ b/src/chrome/locale/so/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/so/torbutton.properties b/src/chrome/locale/so/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/so/torbutton.properties
+++ b/src/chrome/locale/so/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/son/torbutton.dtd
+++ b/src/chrome/locale/son/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/son/torbutton.properties b/src/chrome/locale/son/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/son/torbutton.properties
+++ b/src/chrome/locale/son/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sq/torbutton.properties b/src/chrome/locale/sq/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/sq/torbutton.properties
+++ b/src/chrome/locale/sq/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd
index cf92f6a..e2d127c 100644
--- a/src/chrome/locale/sr/torbutton.dtd
+++ b/src/chrome/locale/sr/torbutton.dtd
@@ -16,33 +16,33 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS домаÑ?ин:">
 <!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
 <!ENTITY torbutton.about.title "Ð? додаÑ?кÑ?">
-<!ENTITY torbutton.about.version "Version:">
-<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.version "Ð?еÑ?зиÑ?а:">
+<!ENTITY torbutton.about.summary "ШÑ?иÑ?и пÑ?иваÑ?ноÑ?Ñ? Tor пÑ?еÑ?Ñ?аживаÑ?а.">
 <!ENTITY torbutton.about.code "Code Contributors:">
 <!ENTITY torbutton.about.maintainer "Maintainer:">
-<!ENTITY torbutton.about.security_review "Security Review:">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
+<!ENTITY torbutton.about.security_review "Ð?езбедноÑ?на Ñ?евизиÑ?а:">
+<!ENTITY torbutton.about.donate "Ð?ко вам Ñ?е Ñ?виÑ?а Tor, Ñ?азмилиÑ?Ñ?е о">
+<!ENTITY torbutton.about.make_donation "дониÑ?аÑ?Ñ?.">
 <!ENTITY torbutton.pref_connection.notice "Ð?абÑ?ани пÑ?оменÑ? овиÑ? поÑ?Ñ?авки.">
 <!ENTITY torbutton.pref_connection.more_info "Ð?иÑ?е инÑ?оÑ?маÑ?иÑ?а">
 <!ENTITY torbutton.pref_connection_more_info.title "Ð?омоÑ?">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ñ?е Ñ?Ñ?енÑ?Ñ?но омогÑ?Ñ?ен. Ð?ко желиÑ?е да пÑ?омениÑ?е Ñ?воÑ?е поÑ?Ñ?авке поÑ?Ñ?едника невезане за Tor, молимо Ð?аÑ? да онемогÑ?Ñ?иÑ?е Torbutton и вÑ?аÑ?иÑ?е Ñ?е овде.  Ð?ко желиÑ?е да пÑ?омениÑ?е Ñ?воÑ?е Tor поÑ?Ñ?авке, молимо Ð?аÑ? да коÑ?иÑ?Ñ?иÑ?е пÑ?озоÑ? за подеÑ?аваÑ?а.">
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
-<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!ENTITY torbutton.context_menu.new_identity "Ð?ов иденÑ?иÑ?еÑ?">
+<!ENTITY torbutton.context_menu.new_identity_key "Ð?">
 <!ENTITY torbutton.context_menu.toggle "Ð?Ñ?омени Ñ?Ñ?аÑ?Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.toggle.key "Ð?">
 <!ENTITY torbutton.context_menu.preferences "Ð?оÑ?Ñ?авке...">
 <!ENTITY torbutton.context_menu.preferences.key "Ð?">
 <!ENTITY torbutton.context_menu.about "Ð? додаÑ?кÑ?...">
 <!ENTITY torbutton.context_menu.about.key "д">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
-<!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
+<!ENTITY torbutton.context_menu.cookieProtections "Ð?озволе за колаÑ?иÑ?е">
+<!ENTITY torbutton.context_menu.cookieProtections.key "Ц">
+<!ENTITY torbutton.context_menu.copyTor "Ð?опÑ?аÑ? Tor адÑ?еÑ?Ñ?">
+<!ENTITY torbutton.context_menu.copyTor.key "п">
+<!ENTITY torbutton.context_menu.openTorTab "Ð?Ñ?воÑ?и Tor адÑ?еÑ?Ñ? Ñ? новоÑ? каÑ?Ñ?иÑ?и">
+<!ENTITY torbutton.context_menu.openTorTab.key "Ñ?">
+<!ENTITY torbutton.context_menu.openTorWindow "Ð?Ñ?воÑ?и Tor адÑ?еÑ?Ñ? Ñ? новом пÑ?озоÑ?Ñ?">
+<!ENTITY torbutton.context_menu.openTorWindow.key "д">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Ð?ликниÑ?е да биÑ?Ñ?е покÑ?енÑ?ли Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Ð?езбедноÑ?не поÑ?Ñ?авке">
@@ -54,7 +54,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Ð?абÑ?ани Ñ?кÑ?ивенÑ? мемоÑ?иÑ?Ñ? и оÑ?иÑ?Ñ?и Ñ?е пÑ?и покÑ?еÑ?аÑ?Ñ? Tor-а">
 <!ENTITY torbutton.prefs.block_cache "Ð?абÑ?ани пÑ?иÑ?Ñ?Ñ?п диÑ?кÑ? и Ñ?кÑ?ивеноÑ? мемоÑ?иÑ?и када Ñ?е Tor омогÑ?Ñ?ен">
 <!ENTITY torbutton.prefs.cookie_jars "СмеÑ?Ñ?и колаÑ?иÑ?е Ñ? заÑ?Ñ?иÑ?ено Ñ?кладиÑ?Ñ?е">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.cookie_protection "Ð?Ñ?оÑ?Ñ?и диÑ?алог за заÑ?Ñ?иÑ?Ñ? колаÑ?иÑ?а за биÑ?аÑ?е">
 <!ENTITY torbutton.prefs.mmm_cookies "РÑ?Ñ?но Ñ?Ñ? Ñ?пÑ?авÑ?аÑ?и Ñ?воÑ?им колаÑ?иÑ?има (опаÑ?но)">
 <!ENTITY torbutton.prefs.clear_cookies "Ð?Ñ?иÑ?Ñ?и колаÑ?иÑ?е пÑ?и покÑ?еÑ?аÑ?Ñ? Tor-а">
 <!ENTITY torbutton.prefs.disable_plugins "Ð?немогÑ?Ñ?и додаÑ?ке када Ñ?е Tor покÑ?енÑ?Ñ? (кÑ?Ñ?Ñ?но)">
@@ -74,9 +74,9 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Ð?немогÑ?Ñ?и Ñ?Ñ?ваÑ?е Ñ?еÑ?иÑ?е (пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?е)">
 <!ENTITY torbutton.prefs.headers "Ð?аглавÑ?а">
 <!ENTITY torbutton.prefs.spoof_english "Ð?меÑ?иÑ?ки енглеÑ?ки пÑ?егледаÑ?">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.refererspoofing "Ð?аÑ?киÑ?аÑ?е Ñ?пÑ?Ñ?иваÑ?а">
 <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.smartspoof "Ð?амеÑ?но маÑ?киÑ?аÑ?е Ñ?пÑ?Ñ?иваÑ?а када Ñ?е Tor омогÑ?Ñ?ен (маÑ?киÑ?а пÑ?еко домена Ñ?пÑ?Ñ?иваÑ?а)">
 <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Ð?немогÑ?Ñ?и DOM Ñ?кладиÑ?Ñ?е када Ñ?е Tor покÑ?енÑ?Ñ? (кÑ?Ñ?Ñ?но)">
 <!ENTITY torbutton.prefs.forms "ФоÑ?мÑ?лаÑ?и">
@@ -85,7 +85,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Ð?е-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Ð?Ñ?и покÑ?еÑ?аÑ?Ñ? пÑ?озоÑ?а за вÑ?аÑ?аÑ?е Ñ?еÑ?иÑ?е, поÑ?Ñ?ави Ñ?Ñ?аÑ?е Tor-а на:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "Ð?Ñ?и покÑ?еÑ?аÑ?Ñ? пÑ?еÑ?Ñ?аживаÑ?а, подÑ?еи Tor Ñ?Ñ?аÑ?е на:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ð?оново Ñ?Ñ?иÑ?аÑ? jar колаÑ?иÑ?/оÑ?иÑ?Ñ?и колаÑ?иÑ?е пÑ?и гÑ?еÑ?Ñ?и Ñ? Ñ?аÑ?еÑ?Ñ?окÑ?Ñ? (пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?е)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "СмеÑ?Ñ?и обиÑ?не и Tor колаÑ?иÑ?е Ñ? заÑ?Ñ?иÑ?еним аÑ?Ñ?ивама (опаÑ?но) ">
 <!ENTITY torbutton.prefs.clear_http_auth "Ð?Ñ?иÑ?Ñ?и HTTP Ñ?еÑ?иÑ?е (пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?е)">
@@ -115,23 +115,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ð?ез поÑ?Ñ?едника за:">
 <!ENTITY torbutton.prefs.no_proxy_warning "УпозоÑ?еÑ?е: избегни коÑ?иÑ?Ñ?еÑ?е изнад наведене називе домаÑ?ина">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
-<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
-<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.prefs.spoofreresh "Ð?аÑ?киÑ?аÑ? оÑ?вежаваÑ?е">
+<!ENTITY torbutton.prefs.refereroptions "Ð?пÑ?иÑ?е за маÑ?киÑ?аÑ?е Ñ?пÑ?Ñ?иваÑ?а">
+<!ENTITY torbutton.prefs.nospoof "Ð?е маÑ?киÑ?аÑ? Ñ?пÑ?Ñ?иваÑ?е">
+<!ENTITY torbutton.prefs.spoofroot "Ð?аÑ?киÑ?аÑ? диÑ?екÑ?оÑ?иÑ?Ñ?м Ñ? коме Ñ?е налази Ñ?Ñ?Ñ?аниÑ?а">
+<!ENTITY torbutton.prefs.spoofdomain "Ð?аÑ?киÑ?аÑ? домен као Ñ?пÑ?Ñ?иваÑ?а">
+<!ENTITY torbutton.prefs.spoofblank "Ð?одÑ?еи да Ñ?пÑ?Ñ?иваÑ? бÑ?де пÑ?азан">
+<!ENTITY torbutton.cookiedialog.title "УÑ?еди заÑ?Ñ?иÑ?Ñ? колаÑ?иÑ?а">
+<!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?Ñ?иÑ?ен">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
-<!ENTITY torbutton.cookiedialog.nameCol "Name">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.nameCol "Ð?ме">
+<!ENTITY torbutton.cookiedialog.pathCol "Ð?Ñ?Ñ?аÑ?а">
+<!ENTITY torbutton.cookiedialog.protectCookie "Ð?аÑ?Ñ?иÑ?и колаÑ?иÑ?">
+<!ENTITY torbutton.cookiedialog.removeCookie "Уклони колаÑ?иÑ?">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Уклони заÑ?Ñ?иÑ?Ñ? колаÑ?иÑ?а">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Уклони Ñ?ве оÑ?им заÑ?Ñ?иÑ?ениÑ?">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?аÑ?Ñ?иÑ?и нове колаÑ?иÑ?е">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?е Ñ?Ñ?иÑ?и нове колаÑ?иÑ?е">
 <!ENTITY torbutton.prefs.disable_livemarks "Ð?немогÑ?Ñ?и ажÑ?Ñ?иÑ?аÑ?а довода када Ñ?е Tor покÑ?енÑ?Ñ?">
 <!ENTITY torbutton.prefs.dtd_recommended "(пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?е)">
 <!ENTITY torbutton.prefs.dtd_optional "(необавезно)">
@@ -144,4 +144,4 @@
 <!ENTITY torbutton.prefs.engine4 "Scroogle.org">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Скини плаÑ?Ñ?оÑ?мÑ? и Ñ?език Ñ?а Google пÑ?еÑ?Ñ?аживаÑ?а">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.transparentTor "ТÑ?анÑ?паÑ?енÑ?а ТоÑ?иÑ?икаÑ?иÑ?а (заÑ?Ñ?ева поÑ?ебан Tor пÑ?окÑ?и или Tor Ñ?Ñ?Ñ?еÑ?)">
diff --git a/src/chrome/locale/sr/torbutton.properties b/src/chrome/locale/sr/torbutton.properties
index a24d51a..c151af3 100644
--- a/src/chrome/locale/sr/torbutton.properties
+++ b/src/chrome/locale/sr/torbutton.properties
@@ -24,7 +24,7 @@ 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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nУколико немаÑ?е повеÑ?еÑ?а Ñ? оваÑ? Ñ?аÑ?л, Ñ?Ñ?еба или да га Ñ?аÑ?Ñ?ваÑ?е па да га оÑ?воÑ?иÑ?е док ниÑ?Ñ?е пÑ?икÑ?Ñ?Ñ?ени на инÑ?еÑ?неÑ? или Ñ? виÑ?Ñ?Ñ?елноÑ? маÑ?ини, или да коÑ?иÑ?Ñ?иÑ?е Ñ?Ñ?анÑ?паÑ?енÑ?ан Tor пÑ?окÑ?и као Ñ?Ñ?о Ñ?Ñ? Tails LiveCD или torsocks.\n
 torbutton.popup.launch = Ð?окÑ?ени пÑ?огÑ?ам
 torbutton.popup.cancel = Ð?Ñ?кажи
 torbutton.popup.dontask = Увек покÑ?еÑ?и пÑ?огÑ?аме од Ñ?ада па надаÑ?е
@@ -34,9 +34,12 @@ torbutton.popup.captcha.ask = Torbutton Ñ?е Ñ?оÑ?ио Google поÑ?вÑ?дни
 torbutton.popup.captcha.always = Увек извÑ?Ñ?и овÑ? Ñ?адÑ?Ñ? од Ñ?ада па надаÑ?е.
 torbutton.popup.redirect = Ð?Ñ?еÑ?Ñ?меÑ?и
 torbutton.popup.no_redirect = Ð?е пÑ?еÑ?Ñ?меÑ?аваÑ?
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Ð?а би вам обезбедио боÑ?Ñ? пÑ?иваÑ?ноÑ?Ñ?, Torbutton може да заÑ?Ñ?ева енглеÑ?кÑ? веÑ?зиÑ?Ñ? инÑ?еÑ?неÑ? Ñ?Ñ?Ñ?аниÑ?а. Ð?бог Ñ?ога, могÑ?Ñ?е Ñ?е да Ñ?е Ñ?Ñ?Ñ?аниÑ?е коÑ?е биÑ?Ñ?е инаÑ?е Ñ?иÑ?али на маÑ?еÑ?Ñ?ем Ñ?езикÑ?, Ñ?меÑ?Ñ?о Ñ?ога пÑ?икажÑ? Ñ?адÑ?жаÑ?е на енглеÑ?ком Ñ?езикÑ?.\n\nÐ?а ли желиÑ?е да заÑ?Ñ?еваÑ?е Ñ?Ñ?Ñ?аниÑ?е на енглеÑ?ком Ñ?езикÑ? Ñ? Ñ?иÑ?Ñ? боÑ?е пÑ?иваÑ?ноÑ?Ñ?и?
+torbutton.popup.no_newnym = Torbutton не може безбедно да вам додели нови иденÑ?иÑ?еÑ? Ñ?еÑ? нема пÑ?иÑ?Ñ?Ñ?п Tor Ð?онÑ?Ñ?олном Ð?оÑ?Ñ?Ñ?.\n\nÐ?а ли коÑ?иÑ?Ñ?иÑ?е Тor Browser Bundle?
+torbutton.popup.use_tbb = Ð?згледа да коÑ?иÑ?Ñ?иÑ?е Torbutton и Firefox, а Ñ?о виÑ?е не пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?емо као безбеднÑ? поÑ?Ñ?авкÑ?.\n\nУмеÑ?Ñ?о Ñ?ога, пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?емо да набавиÑ?е наÑ?новиÑ?и Tor Browser Bundle Ñ?лаÑ?ем поÑ?Ñ?ке на gettor@xxxxxxxxxxxxxx или Ñ?кидаÑ?ем Ñ?а Ñ?ледеÑ?е адÑ?еÑ?е: 
+torbutton.popup.pref_error = Torbutton не може да оÑ?вежи подеÑ?аваÑ?а Ñ? диÑ?екÑ?оÑ?иÑ?Ñ?мÑ? за Tor Browser пÑ?оÑ?иле.
+torbutton.popup.permission_denied = Ð?олимо ваÑ? да Ñ?еÑ?еÑ?Ñ?Ñ?еÑ?е дозволе за диÑ?екÑ?оÑ?иÑ?Ñ?м Ñ? коме Ñ?е налази Tor Browser или да га пÑ?екопиÑ?аÑ?е на дÑ?Ñ?гÑ? локаÑ?иÑ?Ñ?.
+torbutton.popup.device_full = Ð?згледа да Ñ?е диÑ?к пÑ?н. Ð?олимо ваÑ? да оÑ?лободиÑ?е пÑ?оÑ?Ñ?оÑ? или да пÑ?ебаÑ?иÑ?е  Tor Browser на нови Ñ?Ñ?еÑ?аÑ?.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/st/torbutton.dtd
+++ b/src/chrome/locale/st/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/st/torbutton.properties b/src/chrome/locale/st/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/st/torbutton.properties
+++ b/src/chrome/locale/st/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/su/torbutton.dtd
+++ b/src/chrome/locale/su/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/su/torbutton.properties b/src/chrome/locale/su/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/su/torbutton.properties
+++ b/src/chrome/locale/su/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index c495a2a..465760a 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index 9fbd4f9..4d7ecde 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sw/torbutton.properties b/src/chrome/locale/sw/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/sw/torbutton.properties
+++ b/src/chrome/locale/sw/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ta/torbutton.dtd
+++ b/src/chrome/locale/ta/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ta/torbutton.properties b/src/chrome/locale/ta/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ta/torbutton.properties
+++ b/src/chrome/locale/ta/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/te/torbutton.dtd
+++ b/src/chrome/locale/te/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/te/torbutton.properties b/src/chrome/locale/te/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/te/torbutton.properties
+++ b/src/chrome/locale/te/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/tg/torbutton.dtd
+++ b/src/chrome/locale/tg/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/tg/torbutton.properties b/src/chrome/locale/tg/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/tg/torbutton.properties
+++ b/src/chrome/locale/tg/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index e174411..6cfe1c1 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/th/torbutton.properties b/src/chrome/locale/th/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/th/torbutton.properties
+++ b/src/chrome/locale/th/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ti/torbutton.dtd
+++ b/src/chrome/locale/ti/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ti/torbutton.properties b/src/chrome/locale/ti/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ti/torbutton.properties
+++ b/src/chrome/locale/ti/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/tk/torbutton.dtd
+++ b/src/chrome/locale/tk/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/tk/torbutton.properties b/src/chrome/locale/tk/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/tk/torbutton.properties
+++ b/src/chrome/locale/tk/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index d07506e..340884c 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.prefs.crucial =
 torbutton.popup.external.title =             
 torbutton.popup.external.app = Kullanmak için harici bir uygulama seç:\n\n
 torbutton.popup.external.note = \n\nNOT: BaÅ?ka bir uyguluma sizin için güvenli olmayabilir!\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 Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nBu dosya güvenli deÄ?ilse, ona internete baÄ?lı deÄ?ilken veya VM icinde kaydedin,\nya da Tails LiveCD gibi Å?effaf bir Tor proxy veya torsocks tercih edin.\n
 torbutton.popup.launch = Uygulamayı çalıÅ?tır\n            
 torbutton.popup.cancel = Ä°ptal\n            
 torbutton.popup.dontask = Å?u andan itibaren uygulamayı sürekli çalıÅ?tır\r\n            
@@ -34,9 +34,12 @@ torbutton.popup.captcha.ask = Google Captcha algılandı. Aramana devam etmek i
 torbutton.popup.captcha.always = Bu ayarı Å?u andan itibaren sürekli hale getir\n            
 torbutton.popup.redirect = Yönlendir            
 torbutton.popup.no_redirect = Yönlendirme  
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfaların Ä°ngilizce versiyonlarını göstermeye çalıÅ?ır. Bu özellik sayfaları anadilinizde görememenize sebep olabilir.\n\nSiz de daha fazla gizlilik için sayfaların Ä°ngilizce versiyonarını görüntülemek ister misiniz?
+torbutton.popup.no_newnym = Torbutton size güvenli yeni bir kimlik saÄ?layamadı. Tor Control Port una giriÅ? yapılamıyor.\n\nTor Browser Bundle nin çalıÅ?tıÄ?ından emin olun.
+torbutton.popup.use_tbb = GörünüÅ?e göre Turbutton u Firefox ile kullanıyorsunuz, bu tavsiye edilen bir güvenlik ayarlaması deÄ?ildir.\n\nAslında, Size tavsiyemiz Tor Browseri gettor@xxxxxxxxxxxxxx adresine mail göndererek veya Å?u adrese girerek edinmenizdir.
+torbutton.popup.pref_error = Torbutton, Tor Browser profil klasörünün içinde seçenekleri güncelleyemez.
+torbutton.popup.permission_denied = Lütfen Tor Browser klasörünün izinlerini sıfırlayın ya da O nu farklı bir konuma taÅ?ıyın.
+torbutton.popup.device_full = Disk dolu gözüküyor. Lütfen diskte yer açın ya da Tor Browser i farklı bir konuma taÅ?ıyın. 
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 8a48f3d..5664895 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/uk/torbutton.properties b/src/chrome/locale/uk/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/uk/torbutton.properties
+++ b/src/chrome/locale/uk/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ur/torbutton.dtd
+++ b/src/chrome/locale/ur/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ur/torbutton.properties b/src/chrome/locale/ur/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ur/torbutton.properties
+++ b/src/chrome/locale/ur/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/ve/torbutton.dtd
+++ b/src/chrome/locale/ve/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ve/torbutton.properties b/src/chrome/locale/ve/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/ve/torbutton.properties
+++ b/src/chrome/locale/ve/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 7c58e2d..a2a0b57 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index fbfbc24..7f79173 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/wa/torbutton.dtd
+++ b/src/chrome/locale/wa/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/wa/torbutton.properties b/src/chrome/locale/wa/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/wa/torbutton.properties
+++ b/src/chrome/locale/wa/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/wo/torbutton.dtd
+++ b/src/chrome/locale/wo/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/wo/torbutton.properties b/src/chrome/locale/wo/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/wo/torbutton.properties
+++ b/src/chrome/locale/wo/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 0d447e5..5b7c4eb 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -16,19 +16,19 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS 代ç??ï¼?">
 <!ENTITY torbutton.prefs.proxy.port "端��">
 <!ENTITY torbutton.about.title "�� Torbutton">
-<!ENTITY torbutton.about.version "Version:">
+<!ENTITY torbutton.about.version "ç??æ?¬ï¼?">
 <!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.code "代ç ?è´¡ç?®è??ï¼?">
+<!ENTITY torbutton.about.maintainer "ç»´æ?¤äººå??ï¼?">
 <!ENTITY torbutton.about.security_review "Security Review:">
 <!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
-<!ENTITY torbutton.about.make_donation "making a donation.">
+<!ENTITY torbutton.about.make_donation "ç»?äº?æ??èµ ã??">
 <!ENTITY torbutton.pref_connection.notice "ç¦?ç?¨ Torbutton æ?¥æ?¹å??è¿?äº?设置ã??">
 <!ENTITY torbutton.pref_connection.more_info "��信�">
 <!ENTITY torbutton.pref_connection_more_info.title "帮�">
 <!ENTITY torbutton.pref_connection_more_info.text "å¦?æ??æ?¨æ?³æ?¹å??平常ç??代ç??设置ï¼?请å?¨ Torbutton ç¦?ç?¨æ?¶ä¿®æ?¹ã??å¦?æ??æ?¨æ?³æ?¹å??使ç?¨ TorButton æ?¶ç??代ç??设置ï¼?请å?¨ Torbutton å??好设置中修æ?¹ã??å¦?æ??è¿?é??ç??设置ä¸? Torbutton å??好设置中ç??ä¸?å?? Torbutton ä¼?被è?ªå?¨ç¦?ç?¨ã??">
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
-<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!ENTITY torbutton.context_menu.new_identity "�身份">
+<!ENTITY torbutton.context_menu.new_identity_key "æ??">
 <!ENTITY torbutton.context_menu.toggle "转æ?¢ Tor ç?¶æ??">
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "é¦?é??项...">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 90e5496..90ccd27 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/zh-HK/torbutton.properties b/src/chrome/locale/zh-HK/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/zh-HK/torbutton.properties
+++ b/src/chrome/locale/zh-HK/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 94e9e6e..36a5dc3 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy 設�">
 <!ENTITY torbutton.prefs.recommended_settings "å?¨Firefox 使ç?¨å»ºè­°ç?? Proxy 設å®?">
 <!ENTITY torbutton.prefs.use_privoxy "使� Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "使� Polipo">
 <!ENTITY torbutton.prefs.custom_settings "使ç?¨è?ªè¨?ç??Proxy 設å®?">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
@@ -37,17 +37,17 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.copyTor "è¤?製 Tor 網é??網路ä½?å??">
+<!ENTITY torbutton.context_menu.copyTor.key "P">
 <!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "å?¨æ?°ç??è¦?çª?é??å?? Tor 網é??網路ä½?å??">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "é»?æ??以å??å§? Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.sec_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_thwrite "å?¨å??ç?¨ Tor æ??å°?é??ç??覽å?¨">
 <!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 "æ¸?é?¤Tor toggleä¸?ç??æ­·å?²è¨?é??(é?¸é ?)">
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index 521beb8..e3d42fa 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -2,8 +2,8 @@ torbutton.button.tooltip.disabled = å??ç?¨ Tor
 torbutton.button.tooltip.enabled = å??ç?¨ Tor
 torbutton.panel.tooltip.disabled = é»?æ??以å??ç?¨ Tor
 torbutton.panel.tooltip.enabled = é»?æ??以å??ç?¨ Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.plugins.disabled = é»?æ??以å??ç?¨å¤?æ??
+torbutton.panel.plugins.enabled = é»?æ??以å??ç?¨å¤?æ??
 torbutton.panel.label.disabled = Tor å·²å??ç?¨
 torbutton.panel.label.enabled = Tor å·²å??ç?¨
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton æ??ä¾?ä¸?å??å??æ??å??ç?¨/å??ç?¨ Proxy ç??æ??é??
@@ -12,31 +12,34 @@ torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin con
 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 proxy 測試é??é??!
+torbutton.popup.test.failure = Tor proxy 測試失æ??! è«?å??次檢æ?¥æ?¨ Proxy è?? Polipo 設å®?ã??
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = 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 = æ??ä¸? OK å¾?é??å§?測試 Tor Proxy 設å®?ã??é??å??測試æ??å?¨è??æ?¯é??ä½?ã??è«?ç¨?å¾?ã??
+torbutton.panel.label.verified = Tor é©?è­?å®?æ??
 torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
+torbutton.prefs.recommended = (建議�)
+torbutton.prefs.optional = (é?¸æ??æ?§)
+torbutton.prefs.crucial = (é??è¦?ç??)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-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 Tails LiveCD or torsocks.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
+torbutton.popup.external.suggest = \nå¦?æ??é??å??æª?æ¡?æ?¯ä¸?被信任ç??ï¼?æ?¨æ??該å?¨å?²å­?å¾?é?¢ç·?檢è¦?ï¼?æ??æ?¯å?¨ VM ç??ç?°å¢?ä¸?ï¼?\næ??æ?¯è??æ?®ä½¿ç?¨é??é??å¼? Tor 代ç??æ??å??å?¨ï¼?å??æ?¯ Tails LiveCD æ?? torsocksã??\n
+torbutton.popup.launch = å??å??æ??ç?¨ç¨?å¼?
+torbutton.popup.cancel = å??æ¶?
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.title = é?¿é?? Google Captchaså???
 torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.captcha.always = å¾?ç?¾å?¨é??å§?總æ?¯å?·è¡?é??å??å??ä½?
+torbutton.popup.redirect = é??æ?°å°?å??
+torbutton.popup.no_redirect = ä¸?è¦?é??æ?°å°?å??
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.no_newnym = Torbutton ç?¡æ³?å®?å?¨ç??給æ?¨ä¸?å??æ?°ç??身å??ã??å®?ç?¡æ³?å­?å?? Tor æ?§å?¶é?£æ?¥å? ã??\n\næ?¨æ­£å?¨ä½¿ç?¨ Tor Browser Bundle?
 torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.device_full = ç£?ç¢?空é??å?¯è?½å·²æ»¿ã??è«?空å?ºä¸?äº?空é??æ??æ?¯å°? Tor Browser æ?¬ç§»è?³å?¦ä¸?å??è£?ç½®ã??
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/zu/torbutton.dtd
+++ b/src/chrome/locale/zu/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/zu/torbutton.properties b/src/chrome/locale/zu/torbutton.properties
index 773e8db..8679003 100644
--- a/src/chrome/locale/zu/torbutton.properties
+++ b/src/chrome/locale/zu/torbutton.properties
@@ -40,3 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox,
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.



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