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

mikeperry at torproject.org mikeperry at torproject.org
Thu May 31 22:27:42 UTC 2012


commit 8354d3a5aa096effec63df4544d4e4da382817fe
Author: Mike Perry <mikeperry-git at fscked.org>
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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Per donar-vos més privacitat, Torbutton pot demanar la versió en anglès de les pàgines web. Això pot provocar que pàgines web que preferiu veure a la vostra llengua nativa siguin mostrades en anglès.\n\nDesitjeu demanar les pàgines web en anglès per una major privacitat?
+torbutton.popup.no_newnym = Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposa d'accés al Tor Control Port.\n\nEsteu usant Tor Browser Bundle?
+torbutton.popup.use_tbb = Sembla que esteu usant Torbutton amb Firefox, el qual ja no és una configuració segura recomanada.\n\nAl seu lloc, recomanem que obtingueu l'últim Tor Browser Bundle enviant un email a gettor at torproject.org o bé descarregant-lo de l'adreça següent:
+torbutton.popup.pref_error = Torbutton no pot actualitzar les preferències al directori de perfil del Tor Browser.
+torbutton.popup.permission_denied = Siusplau, o bé re-inicieu els permisos del directori Tor Browser o copieu-lo a una nova ubicació.
+torbutton.popup.device_full = Sembla que el disc és ple. Siusplau allibereu espai o moveu Tor Browser a un nou dispositiu.
+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 at torproject.org or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+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 at torproject.org eller henter den på følgende URL: 
+torbutton.popup.pref_error = Torbutton kan ikke opdatere præferencer i profil-kataloget for Tor Browser.
+torbutton.popup.permission_denied = Nulstil venligst rettighederne for Tor Browser-kataloget eller kopiér det til en ny placering.
+torbutton.popup.device_full = Disken ser ud til at være fuld. Frigør venligst plads eller flyt Tor Browser til en ny enhed.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Για την ενίσχυση του απορρήτου σας το Torbutton μπορεί να ζητήσει την έκδοση της αγγλικής γλώσσας για τις ιστοσελίδες. Αυτό μπορεί να έχει σαν αποτέλεσμα, οι ιστοσελίδες που επιλέξατε να εμφανίζονται στην εθνική σας γλώσα, να προβάλονται αντ' αυτής στην Αγγλική.\n\nΘέλετε να αιτούνται σελίδες γραμμένες στα Αγγλικά, για την βελτίωση του απορρήτου;
+torbutton.popup.no_newnym = Το Torbutton δεν μπορεί να σας δώσει μια ασφαλή νέα ταυτότητα, διότι δεν έχει πρόσβαση στο Tor Control Port:\n\nΧρησιμοποιείτε το Πακέτο Φυλλομετρητή Tor;
+torbutton.popup.use_tbb = Φαίνεται ότι χρησιμοποιείτε το Torbutton μαζί με Firefox, συνδυασμός που δεν είναι ο πλεον ασφαλής.\n\nΣας προτείνουμε να λάβετε την νεότερη έκδοση του Πακέτου Φυλλομετρητή Tor, στέλνοντας ένα email στη διεύθυνση gettor at torproject.org ή κατεβάζοντάς το από την ακόλουθη διεύθυνση URL:
+torbutton.popup.pref_error = Το Torbutton δεν μπορεί να ενημερώσει τις προτιμήσεις στον κατάλογο του προφίλ σαςτου Φυλλομετρητή Tor.
+torbutton.popup.permission_denied = Παρακαλούμε είτε να επαναφέρετε τις άδειες του καταλόγου Φυλλομετρητή Tor είτε να τον αντιγράψετε σε μια νέα τοποθεσία.
+torbutton.popup.device_full = Ο δίσκος φαίνεται ότι είναι γεμάτος. Παρακαλούμε ελευθερώστε χώρο στον δίσκο ή μετακινήστε τον Φυλλομετρητή Tor σε κάποιον άλλο δίσκο.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.prompted_language = Pribatutasun gehiago emateko, Torbuttonek webguneen Ingelerazko bertsioa eska dezake. Honek zure ama hizkuntzan irakurtzea nahiago izan ditzakezun orriak Ingeleraz agertzea ekar dezake.\n\nNahiko al zenuke webguneen Ingelerazko hizkuntza eskatu pribatutasun hobeagoa izateko?
+torbutton.popup.no_newnym = Torbuttonek ezin dizu modu seguruan nortasun berri bat eman. Ez du Tor Kontrol Portura nola sartzerik.\n\nTor Browser Bundle exekutatzen ari al zara?
+torbutton.popup.use_tbb = Badirudi Torbutton Firefoxekin erabiltzen ari zarela, gehiago gomendatzen ez den segurtasun konfigurazioa izanik.\n\nHorren ordez, azkenengo Tor Browser Bundlea eskura dezazun gomendatzen dizugu, bai gettor at torproject.org-era email bat bidaliz bai hurrengo URLetik jaitsiz:
+torbutton.popup.pref_error = Torbuttonek ezin ditu Tor Browser profilaren direktorioan hobespenak eguneratu.
+torbutton.popup.permission_denied = Mesedez berrezarri Tor Browser direktorioaren baimenak edo kopia ezazu beste kokaleku batera.
 torbutton.popup.device_full = Diska beteta dago, antza. Mesedez egizu lekua edo mugitu Tor Nabigatzailea gailu berri batera.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.no_redirect = Älä uudelleenohjaa
+torbutton.popup.prompted_language = Yksityisyytesi lisäämiseksi Torbutton voi pyytää webbisivuista englanninkielisen version. Tämä saattaa aiheuttaa sen, että webbisivut, jotka luet mieluiten äidinkielelläsi, näytetään englanniksi.\n\nHaluatko pyytää webbisivut englanniksi yksityisyyden lisäämiseksi?
+torbutton.popup.no_newnym = Torbutton ei voi taata sinulle turvallisesti uutta identiteettiä. Sillä ei ole pääsyä Tor-hallintaporttiin.\n\nOnko Tor Browser Bundle käytössä?
+torbutton.popup.use_tbb = Näyttää siltä, että käytät Torbuttonia Firefoxin kanssa, mitä ei enää suositella turvallisena yhdistelmänä.\n\nSen sijaan suosittelemme, että hankit uusimman Tor Browser Bundlen lähettämällä sähköpostin osoitteeseen gettor at torproject.org tai lataamalla sen osoitteesta:
+torbutton.popup.pref_error = Torbutton ei voi päivittää asetuksia Tor Browserin profiilihakemistossa.
+torbutton.popup.permission_denied = Aseta Tor Browserin hakemiston käyttöoikeudet uusiksi tai kopioi se uuteen sijaintiin.
+torbutton.popup.device_full = Levy näyttäisi olevan täysi. Vapauta tilaa tai siirrä Tor Browser uudelle laitteelle.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Para proporcionar mais privacidade a você, o Torbutton pode requisitar a versão em inglês de páginas da web. Isso pode fazer com que páginas que você prefere ler na sua língua nativa apareçam em Inglês.
+torbutton.popup.no_newnym = O Torbutton não pode te dar uma nova identidade com segurança. Ele não tem acesso à Porta de Controle Tor.\n\\n\nVocê está usando o Tor Browser Bundle?
+torbutton.popup.use_tbb = Parece que você está usando o Torbutton com o Firefox, que não é mais uma configuração segura recomendada.\n\nEm vez disso, recomendamos que obtenha a versão mais recente do Tor Browser Bundle, enviando um e-mail para gettor at torproject.org ou fazendo o download no seguinte endereço:
+torbutton.popup.pref_error = O Torbutton não pode atualizar as preferências na pasta de perfil do Tor Browser.
+torbutton.popup.permission_denied = Por favor, restaure as permissões da pasta do Tor browser ou copie-a para um outro lugar.
+torbutton.popup.device_full = Este disco parece estar cheio. Por favor, libere espaço ou mova o Tor Browser para um novo dispositivo.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Pentru a va asigura o confidentialitate sporita, Torbutton poate solicita versiunea in limba engleza a paginilor web. Acest lucru poate determina afisarea in limba engleza a paginilor pe care ati fi dorit sa le cititi in limba dumneavoastra natala.\n\nDoriti sa solicitati versiunea in limba engleza a paginilor web pentru a va bucura de o confidentialitate sporita ?
+torbutton.popup.no_newnym = Torbutton nu va poate oferi in siguranta o noua identitate. Nu are acces la Tor Control Port\n\nSunteti sigur ca utilizati Tor Browser Bundle?
+torbutton.popup.use_tbb = Se pare ca utilizati Torbutton împreună cu Firefox, ceea ce nu mai este recomandată ca fiind o configuratie sigură.\n\nIn schimb, va recomandam sa obtineti ultima versiune a Tor Browser Bundle trimitand un email la: gettor at torproject.org sau prin descarcarea acesteia de la urmatoarea adresa URL: 
+torbutton.popup.pref_error = Torbutton nu poate actualiza preferintele in directorul de profile al Tor Bowser.
+torbutton.popup.permission_denied = Va rugam fie sa resetati permisiunile directorului Tor Browser fie sa il copiati intr-o locatie noua.
+torbutton.popup.device_full = Discul pare sa fie plin. Va rugam sa asigurati mai mult spatiu liber pe disc sau sa mutati Tor browser pe un nou dispozitiv.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = Для предоставления большей приватности, Torbutton может запрашивать версии страниц на английском языке. Это может повлечь отображение страниц на английском языке, вместо отображения их на вашем родном языке.\n\nХотите запрашивать страницы на английском языке для большей приватности?
+torbutton.popup.no_newnym = Torbutton не может безопасно дать вам новую личность. Он не имеет доступа к Tor Control Port.\n\nВы используете Tor Browser Bundle?
+torbutton.popup.use_tbb = Похоже, что вы используете Torbutton и Firefox, что более не является рекомендуемой безопасной конфигурацией.\n\nВместо этого, мы рекомендуем вам получить последний Tor Browser Bundle отослав email на gettor at torproject.org или скачав его по следующей ссылке: 
+torbutton.popup.pref_error = Torbutton не может обновить настройки в папке профиля Tor Browser.
+torbutton.popup.permission_denied = Пожалуйста, либо сбросьте разрешения для папки Tor Browser или скопируйте её в другое место.
+torbutton.popup.device_full = Похоже, что диск заполнен. Пожалуйста, освободите место или переместите Tor Browser на другой диск.
+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 at torproject.org or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+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 at torproject.org или скидањем са следеће адресе: 
+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 at torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+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 at torproject.org 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 at torproject.org or by downloading it at the following URL: 
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+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.





More information about the tor-commits mailing list