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

[tor-commits] [torbutton/master] Move new strings to all locales.



commit 5c0df1fb787841f0fc24f9064c745eaf22d8b9f3
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Mon Feb 11 19:29:19 2013 -0800

    Move new strings to all locales.
---
 src/chrome/locale/af/torbutton.dtd           |    4 +
 src/chrome/locale/af/torbutton.properties    |    2 +-
 src/chrome/locale/ak/torbutton.dtd           |    4 +
 src/chrome/locale/ak/torbutton.properties    |    2 +-
 src/chrome/locale/am/torbutton.dtd           |    4 +
 src/chrome/locale/am/torbutton.properties    |    2 +-
 src/chrome/locale/ar/torbutton.dtd           |    4 +
 src/chrome/locale/ar/torbutton.properties    |    8 +-
 src/chrome/locale/arn/torbutton.dtd          |    4 +
 src/chrome/locale/arn/torbutton.properties   |    2 +-
 src/chrome/locale/ast/torbutton.dtd          |    4 +
 src/chrome/locale/ast/torbutton.properties   |    2 +-
 src/chrome/locale/az/torbutton.dtd           |    4 +
 src/chrome/locale/az/torbutton.properties    |    2 +-
 src/chrome/locale/be/torbutton.dtd           |    4 +
 src/chrome/locale/be/torbutton.properties    |    2 +-
 src/chrome/locale/bg/torbutton.dtd           |    4 +
 src/chrome/locale/bg/torbutton.properties    |    2 +-
 src/chrome/locale/bn-IN/torbutton.dtd        |    4 +
 src/chrome/locale/bn-IN/torbutton.properties |    2 +-
 src/chrome/locale/bn/torbutton.dtd           |    4 +
 src/chrome/locale/bn/torbutton.properties    |    2 +-
 src/chrome/locale/bo/torbutton.dtd           |    4 +
 src/chrome/locale/bo/torbutton.properties    |    2 +-
 src/chrome/locale/br/torbutton.dtd           |    4 +
 src/chrome/locale/br/torbutton.properties    |    2 +-
 src/chrome/locale/bs/torbutton.dtd           |    4 +
 src/chrome/locale/bs/torbutton.properties    |    2 +-
 src/chrome/locale/ca/torbutton.dtd           |    4 +
 src/chrome/locale/ca/torbutton.properties    |    2 +-
 src/chrome/locale/cs/torbutton.dtd           |    4 +
 src/chrome/locale/cs/torbutton.properties    |    2 +-
 src/chrome/locale/csb/torbutton.dtd          |    4 +
 src/chrome/locale/csb/torbutton.properties   |    2 +-
 src/chrome/locale/cy/torbutton.dtd           |    4 +
 src/chrome/locale/cy/torbutton.properties    |    2 +-
 src/chrome/locale/da/torbutton.dtd           |    4 +
 src/chrome/locale/da/torbutton.properties    |    2 +-
 src/chrome/locale/de/torbutton.dtd           |    4 +
 src/chrome/locale/de/torbutton.properties    |    8 +-
 src/chrome/locale/dz/torbutton.dtd           |    4 +
 src/chrome/locale/dz/torbutton.properties    |    2 +-
 src/chrome/locale/el/torbutton.dtd           |    4 +
 src/chrome/locale/el/torbutton.properties    |   12 +-
 src/chrome/locale/eo/torbutton.dtd           |    4 +
 src/chrome/locale/eo/torbutton.properties    |    2 +-
 src/chrome/locale/es/torbutton.dtd           |  184 ++++++++++---------
 src/chrome/locale/es/torbutton.properties    |   78 ++++----
 src/chrome/locale/et/torbutton.dtd           |    4 +
 src/chrome/locale/et/torbutton.properties    |    2 +-
 src/chrome/locale/eu/torbutton.dtd           |    4 +
 src/chrome/locale/eu/torbutton.properties    |   12 +-
 src/chrome/locale/fa/torbutton.dtd           |    4 +
 src/chrome/locale/fa/torbutton.properties    |    4 +-
 src/chrome/locale/fi/torbutton.dtd           |    4 +
 src/chrome/locale/fi/torbutton.properties    |    2 +-
 src/chrome/locale/fil/torbutton.dtd          |    4 +
 src/chrome/locale/fil/torbutton.properties   |    2 +-
 src/chrome/locale/fo/torbutton.dtd           |    4 +
 src/chrome/locale/fo/torbutton.properties    |    2 +-
 src/chrome/locale/fr/torbutton.dtd           |    4 +
 src/chrome/locale/fr/torbutton.properties    |    8 +-
 src/chrome/locale/fur/torbutton.dtd          |    4 +
 src/chrome/locale/fur/torbutton.properties   |    2 +-
 src/chrome/locale/fy/torbutton.dtd           |    4 +
 src/chrome/locale/fy/torbutton.properties    |    2 +-
 src/chrome/locale/ga/torbutton.dtd           |    4 +
 src/chrome/locale/ga/torbutton.properties    |    2 +-
 src/chrome/locale/gl/torbutton.dtd           |    4 +
 src/chrome/locale/gl/torbutton.properties    |    2 +-
 src/chrome/locale/gu/torbutton.dtd           |    4 +
 src/chrome/locale/gu/torbutton.properties    |    2 +-
 src/chrome/locale/gun/torbutton.dtd          |    4 +
 src/chrome/locale/gun/torbutton.properties   |    2 +-
 src/chrome/locale/ha/torbutton.dtd           |    4 +
 src/chrome/locale/ha/torbutton.properties    |    2 +-
 src/chrome/locale/he/torbutton.dtd           |   64 ++++---
 src/chrome/locale/he/torbutton.properties    |    6 +-
 src/chrome/locale/hi/torbutton.dtd           |    4 +
 src/chrome/locale/hi/torbutton.properties    |    2 +-
 src/chrome/locale/hr/torbutton.dtd           |    4 +
 src/chrome/locale/hr/torbutton.properties    |    2 +-
 src/chrome/locale/ht/torbutton.dtd           |    4 +
 src/chrome/locale/ht/torbutton.properties    |    2 +-
 src/chrome/locale/hu/torbutton.dtd           |    4 +
 src/chrome/locale/hu/torbutton.properties    |   12 +-
 src/chrome/locale/hy/torbutton.dtd           |    4 +
 src/chrome/locale/hy/torbutton.properties    |    2 +-
 src/chrome/locale/id/torbutton.dtd           |    4 +
 src/chrome/locale/id/torbutton.properties    |    2 +-
 src/chrome/locale/is/torbutton.dtd           |    4 +
 src/chrome/locale/is/torbutton.properties    |    2 +-
 src/chrome/locale/it/torbutton.dtd           |    4 +
 src/chrome/locale/it/torbutton.properties    |    8 +-
 src/chrome/locale/ja/torbutton.dtd           |    4 +
 src/chrome/locale/ja/torbutton.properties    |    2 +-
 src/chrome/locale/jv/torbutton.dtd           |    4 +
 src/chrome/locale/jv/torbutton.properties    |    2 +-
 src/chrome/locale/ka/torbutton.dtd           |    4 +
 src/chrome/locale/ka/torbutton.properties    |    2 +-
 src/chrome/locale/km/torbutton.dtd           |    4 +
 src/chrome/locale/km/torbutton.properties    |    2 +-
 src/chrome/locale/kn/torbutton.dtd           |    4 +
 src/chrome/locale/kn/torbutton.properties    |    2 +-
 src/chrome/locale/ko/torbutton.dtd           |    4 +
 src/chrome/locale/ko/torbutton.properties    |    2 +-
 src/chrome/locale/ku/torbutton.dtd           |    4 +
 src/chrome/locale/ku/torbutton.properties    |    2 +-
 src/chrome/locale/kw/torbutton.dtd           |    4 +
 src/chrome/locale/kw/torbutton.properties    |    2 +-
 src/chrome/locale/ky/torbutton.dtd           |    4 +
 src/chrome/locale/ky/torbutton.properties    |    2 +-
 src/chrome/locale/lb/torbutton.dtd           |    4 +
 src/chrome/locale/lb/torbutton.properties    |    2 +-
 src/chrome/locale/ln/torbutton.dtd           |    4 +
 src/chrome/locale/ln/torbutton.properties    |    2 +-
 src/chrome/locale/lo/torbutton.dtd           |    4 +
 src/chrome/locale/lo/torbutton.properties    |    2 +-
 src/chrome/locale/lt/torbutton.dtd           |    4 +
 src/chrome/locale/lt/torbutton.properties    |    2 +-
 src/chrome/locale/lv/torbutton.dtd           |  256 +++++++++++++-------------
 src/chrome/locale/lv/torbutton.properties    |   10 +-
 src/chrome/locale/mg/torbutton.dtd           |    4 +
 src/chrome/locale/mg/torbutton.properties    |    2 +-
 src/chrome/locale/mi/torbutton.dtd           |    4 +
 src/chrome/locale/mi/torbutton.properties    |    2 +-
 src/chrome/locale/mk/torbutton.dtd           |    4 +
 src/chrome/locale/mk/torbutton.properties    |    2 +-
 src/chrome/locale/ml/torbutton.dtd           |    4 +
 src/chrome/locale/ml/torbutton.properties    |    2 +-
 src/chrome/locale/mn/torbutton.dtd           |    4 +
 src/chrome/locale/mn/torbutton.properties    |    2 +-
 src/chrome/locale/mr/torbutton.dtd           |    4 +
 src/chrome/locale/mr/torbutton.properties    |    2 +-
 src/chrome/locale/ms/torbutton.dtd           |    4 +
 src/chrome/locale/ms/torbutton.properties    |    2 +-
 src/chrome/locale/mt/torbutton.dtd           |    4 +
 src/chrome/locale/mt/torbutton.properties    |    2 +-
 src/chrome/locale/my/torbutton.dtd           |    4 +
 src/chrome/locale/my/torbutton.properties    |    2 +-
 src/chrome/locale/nah/torbutton.dtd          |    4 +
 src/chrome/locale/nah/torbutton.properties   |    2 +-
 src/chrome/locale/nap/torbutton.dtd          |    4 +
 src/chrome/locale/nap/torbutton.properties   |    2 +-
 src/chrome/locale/nb/torbutton.dtd           |    4 +
 src/chrome/locale/nb/torbutton.properties    |    2 +-
 src/chrome/locale/ne/torbutton.dtd           |    4 +
 src/chrome/locale/ne/torbutton.properties    |    2 +-
 src/chrome/locale/nl/torbutton.dtd           |    4 +
 src/chrome/locale/nl/torbutton.properties    |    8 +-
 src/chrome/locale/nn/torbutton.dtd           |    4 +
 src/chrome/locale/nn/torbutton.properties    |    2 +-
 src/chrome/locale/nso/torbutton.dtd          |    4 +
 src/chrome/locale/nso/torbutton.properties   |    2 +-
 src/chrome/locale/oc/torbutton.dtd           |    4 +
 src/chrome/locale/oc/torbutton.properties    |    2 +-
 src/chrome/locale/or/torbutton.dtd           |    4 +
 src/chrome/locale/or/torbutton.properties    |    2 +-
 src/chrome/locale/pa/torbutton.dtd           |    4 +
 src/chrome/locale/pa/torbutton.properties    |    2 +-
 src/chrome/locale/pap/torbutton.dtd          |    4 +
 src/chrome/locale/pap/torbutton.properties   |    2 +-
 src/chrome/locale/pl/torbutton.dtd           |    4 +
 src/chrome/locale/pl/torbutton.properties    |   12 +-
 src/chrome/locale/pms/torbutton.dtd          |    4 +
 src/chrome/locale/pms/torbutton.properties   |    2 +-
 src/chrome/locale/ps/torbutton.dtd           |    4 +
 src/chrome/locale/ps/torbutton.properties    |    2 +-
 src/chrome/locale/pt-BR/torbutton.dtd        |    6 +-
 src/chrome/locale/pt-BR/torbutton.properties |   18 +-
 src/chrome/locale/pt/torbutton.dtd           |    4 +
 src/chrome/locale/pt/torbutton.properties    |   40 ++--
 src/chrome/locale/ro/torbutton.dtd           |   46 +++--
 src/chrome/locale/ro/torbutton.properties    |   10 +-
 src/chrome/locale/ru/torbutton.dtd           |    4 +
 src/chrome/locale/ru/torbutton.properties    |   12 +-
 src/chrome/locale/sco/torbutton.dtd          |    4 +
 src/chrome/locale/sco/torbutton.properties   |    2 +-
 src/chrome/locale/sk/torbutton.dtd           |    4 +
 src/chrome/locale/sk/torbutton.properties    |    2 +-
 src/chrome/locale/sl/torbutton.dtd           |    4 +
 src/chrome/locale/sl/torbutton.properties    |    2 +-
 src/chrome/locale/so/torbutton.dtd           |    4 +
 src/chrome/locale/so/torbutton.properties    |    2 +-
 src/chrome/locale/son/torbutton.dtd          |    4 +
 src/chrome/locale/son/torbutton.properties   |    2 +-
 src/chrome/locale/sq/torbutton.dtd           |    4 +
 src/chrome/locale/sq/torbutton.properties    |    2 +-
 src/chrome/locale/sr/torbutton.dtd           |    4 +
 src/chrome/locale/sr/torbutton.properties    |    2 +-
 src/chrome/locale/st/torbutton.dtd           |    4 +
 src/chrome/locale/st/torbutton.properties    |    2 +-
 src/chrome/locale/su/torbutton.dtd           |    4 +
 src/chrome/locale/su/torbutton.properties    |    2 +-
 src/chrome/locale/sv/torbutton.dtd           |   58 +++---
 src/chrome/locale/sv/torbutton.properties    |   24 ++--
 src/chrome/locale/sw/torbutton.dtd           |    4 +
 src/chrome/locale/sw/torbutton.properties    |    2 +-
 src/chrome/locale/ta/torbutton.dtd           |    4 +
 src/chrome/locale/ta/torbutton.properties    |    2 +-
 src/chrome/locale/te/torbutton.dtd           |    4 +
 src/chrome/locale/te/torbutton.properties    |    2 +-
 src/chrome/locale/tg/torbutton.dtd           |    4 +
 src/chrome/locale/tg/torbutton.properties    |    2 +-
 src/chrome/locale/th/torbutton.dtd           |    4 +
 src/chrome/locale/th/torbutton.properties    |    2 +-
 src/chrome/locale/ti/torbutton.dtd           |    4 +
 src/chrome/locale/ti/torbutton.properties    |    2 +-
 src/chrome/locale/tk/torbutton.dtd           |    4 +
 src/chrome/locale/tk/torbutton.properties    |    2 +-
 src/chrome/locale/tr/torbutton.dtd           |    4 +
 src/chrome/locale/tr/torbutton.properties    |    2 +-
 src/chrome/locale/uk/torbutton.dtd           |    4 +
 src/chrome/locale/uk/torbutton.properties    |    2 +-
 src/chrome/locale/ur/torbutton.dtd           |    4 +
 src/chrome/locale/ur/torbutton.properties    |    2 +-
 src/chrome/locale/ve/torbutton.dtd           |    4 +
 src/chrome/locale/ve/torbutton.properties    |    2 +-
 src/chrome/locale/vi/torbutton.dtd           |    4 +
 src/chrome/locale/vi/torbutton.properties    |    2 +-
 src/chrome/locale/wa/torbutton.dtd           |    4 +
 src/chrome/locale/wa/torbutton.properties    |    2 +-
 src/chrome/locale/wo/torbutton.dtd           |    4 +
 src/chrome/locale/wo/torbutton.properties    |    2 +-
 src/chrome/locale/zh-CN/torbutton.dtd        |  132 +++++++-------
 src/chrome/locale/zh-CN/torbutton.properties |   24 ++--
 src/chrome/locale/zh-HK/torbutton.dtd        |    4 +
 src/chrome/locale/zh-HK/torbutton.properties |    2 +-
 src/chrome/locale/zh-TW/torbutton.dtd        |    4 +
 src/chrome/locale/zh-TW/torbutton.properties |    2 +-
 src/chrome/locale/zu/torbutton.dtd           |    4 +
 src/chrome/locale/zu/torbutton.properties    |    2 +-
 232 files changed, 1077 insertions(+), 613 deletions(-)

diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/af/torbutton.properties b/src/chrome/locale/af/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/af/torbutton.properties
+++ b/src/chrome/locale/af/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ak/torbutton.dtd
+++ b/src/chrome/locale/ak/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ak/torbutton.properties b/src/chrome/locale/ak/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ak/torbutton.properties
+++ b/src/chrome/locale/ak/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/am/torbutton.dtd
+++ b/src/chrome/locale/am/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/am/torbutton.properties b/src/chrome/locale/am/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/am/torbutton.properties
+++ b/src/chrome/locale/am/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index b6b30ce..8fb18b8 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "أزÙ? اÙ?Ù?Ù?صة Ù?اÙ?Ù?غة Ù?Ù? استÙ?سارات Ù?حرÙ? بحث غÙ?غÙ?">
 <!ENTITY torbutton.prefs.transparentTor "Ø´Ù?اÙ?Ù?Ø© تÙ?رÙ?Ù?Ù?Ù?Ø´Ù? (تحتاج Ù?Ù?جÙ? تÙ?ر Ø£Ù? تراÙ?سبÙ?Ù?سÙ? Ù?خصص)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index b3f8df6..df28e53 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = اÙ?Ù?ر Ù?تÙ?عÙ?Ù? اÙ?Ù?Ù?Ø­Ù?ات
 torbutton.panel.plugins.enabled = اÙ?Ù?ر Ù?تعطÙ?Ù? اÙ?Ù?Ù?Ø­Ù?ات
 torbutton.panel.label.disabled = تÙ?ر Ù?عطÙ?Ù?
 torbutton.panel.label.enabled = تÙ?ر Ù?Ù?عÙ?Ù?
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ù?Ù?Ù?ر Ù?Ù?تاح تÙ?ر تحÙ?Ù?ا سÙ?Ù?ا Ù?Ù? استخداÙ? Ù?Ù?رÙ?Ù?Ù?س Ù?Ù?Ù?Ù?Ù? تÙ?ر
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = حجب Ù?Ù?تاح تÙ?ر Ù?شاطاÙ? Ù?Ù? اÙ?تبÙ?Ù?بة اÙ?Ù?Ø­Ù?Ù?Ø© Ù?Ù? Ù?ضع تÙ?ر Ù?ختÙ?Ù?.\n\nÙ?ذا اÙ?Ø£Ù?ر Ù?Ù?اÙ?تÙ?اÙ? Ø­Ù?Ù? Ù?شاÙ?Ù? Ù?اÙ?رÙ?Ù?Ù?س رÙ?Ù? 409737 Ù?417869.\n\nإذا ظÙ?رت Ù?Ø°Ù? اÙ?رساÙ?Ø© اÙ?Ù?Ù?بثÙ?Ø© دÙ?Ù? سبب ظاÙ?رÙ?Ø? Ù?Ù?اÙ? إحدÙ? تبÙ?Ù?باتÙ? تحاÙ?Ù? إعادة تحÙ?Ù?Ù? Ù?Ù?سÙ?ا Ù?Ù? اÙ?Ø®Ù?Ù?Ù?Ø©Ø? Ù?تÙ? حجب Ù?ذا.\n\nÙ?إعادة تحÙ?Ù?Ù? اÙ?تبÙ?Ù?بة Ù?Ù? حاÙ?Ø© تÙ?ر Ù?Ø°Ù? Ù?رجÙ? Ø£Ù? تضغط 'Enter' Ù?Ù? صÙ?دÙ?Ù? شرÙ?Ø· اÙ?عÙ?Ù?اÙ?.\n\n
 torbutton.popup.plugin.warning = Ù?Ù?ع Ù?Ù?تاح تÙ?ر تحÙ?Ù?Ù?ا Ù?باشرا Ù?Ù?حتÙ?Ù? Ù?Ù?Ø­Ù?Ø©.\n\nاستخدÙ? 'احÙ?ظ باسÙ?' بدÙ?ا عÙ? Ù?ذا.\n\n
 torbutton.popup.confirm_ca_certs = Ù?Ù?احظة Ù?Ù?تاح تÙ?ر: بÙ?ا Ø£Ù?Ù?Ù? Ù?ا تÙ?Ù?Ù? Ù?Ù?ثاÙ? إصدار اÙ?Ø´Ù?ادة اÙ?رÙ?Ù?Ù?Ø? Ù?Ø­Ù?Ø« Ø£Ù?Ù? عÙ?Ù?Ù?Ø© Ù?حص Ù?ائÙ?Ø© Ù?صدر اÙ?Ø´Ù?ادة اÙ?رÙ?Ù?Ù? عÙ?Ù?Ù?Ø© بطÙ?ئة Ù?تسبب بطئا Ù?Ù? عÙ?Ù? Ù?Ù?تاح تÙ?رØ? Ù?Ù?Ù? ترغب Ù?Ù? تعطÙ?Ù? عÙ?Ù?Ù?Ø© عزÙ? Ø´Ù?ادات اÙ?إصدار اÙ?رÙ?Ù?Ù?Ø? (Ø¥Ù? Ù?Ù?ت Ù?ا تعÙ?Ù? اÙ? Ù?ا تÙ?Ù?Ù? Ù?عÙ?Ù? Ø°Ù?Ù?Ø? Ù?Ø¥Ù?Ù? Ù?Ù? اÙ?Ù?ستحسÙ? Ø£Ù? تختار Ø®Ù?ار اÙ?Ù?Ù?اÙ?Ù?Ø©) 
@@ -45,8 +45,8 @@ torbutton.popup.prompt_torbrowser = تغÙ?رت طرÙ?Ù?Ø© عÙ?Ù? زر تÙ?ر ا
 torbutton.popup.short_torbrowser = Ù?عÙ?Ù?Ù?ات Ù?اÙ?Ø© عÙ? تÙ?ر \nتÙ? تÙ?Ù?Ù?Ù? زر تÙ?ر Ù?Ù?عÙ?Ù? باستÙ?رار اÙ?اÙ?\nاضغط عÙ?Ù? زر تÙ?ر Ù?Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات 
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=حاÙ?Ù? اÙ?Ù?Ù?Ù?ع (%S) Ù?Ù?عÙ?Ù?Ù?ات صÙ?رة Ù?Ù? عÙ?Ù? سطح اÙ?رسÙ?. Ù?Ø£Ù? Ù?عÙ?Ù?Ù?ات اÙ?صÙ?ر Ù?Ù? عÙ?Ù? سطح اÙ?رسÙ?Ø? Ù?Ù?Ù?Ù? استخداÙ?Ù?ا Ù?Ù?عرÙ?Ø© Ù?عÙ?Ù?Ù?ات عÙ? حاسبÙ?Ø? Ù?Ø°Ù?Ù? Ù?Ù?Ø· تÙ? تزÙ?د صÙ?رة خاÙ?Ù?Ø© Ù?Ø°Ù? اÙ?Ù?رة.
+canvas.allow=اسÙ?Ø­ Ù?Ù? اÙ?Ù?ستÙ?بÙ?
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Ù?Ø·Ù?Ù?اÙ? Ù?Ù? Ù?ذا اÙ?Ù?Ù?Ù?ع
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/arn/torbutton.dtd
+++ b/src/chrome/locale/arn/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/arn/torbutton.properties b/src/chrome/locale/arn/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/arn/torbutton.properties
+++ b/src/chrome/locale/arn/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ast/torbutton.dtd
+++ b/src/chrome/locale/ast/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ast/torbutton.properties b/src/chrome/locale/ast/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ast/torbutton.properties
+++ b/src/chrome/locale/ast/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/az/torbutton.dtd
+++ b/src/chrome/locale/az/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/az/torbutton.properties b/src/chrome/locale/az/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/az/torbutton.properties
+++ b/src/chrome/locale/az/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/be/torbutton.dtd
+++ b/src/chrome/locale/be/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/be/torbutton.properties b/src/chrome/locale/be/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/be/torbutton.properties
+++ b/src/chrome/locale/be/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bg/torbutton.properties b/src/chrome/locale/bg/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/bg/torbutton.properties
+++ b/src/chrome/locale/bg/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/bn-IN/torbutton.dtd
+++ b/src/chrome/locale/bn-IN/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bn-IN/torbutton.properties b/src/chrome/locale/bn-IN/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/bn-IN/torbutton.properties
+++ b/src/chrome/locale/bn-IN/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/bn/torbutton.dtd
+++ b/src/chrome/locale/bn/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bn/torbutton.properties b/src/chrome/locale/bn/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/bn/torbutton.properties
+++ b/src/chrome/locale/bn/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bo/torbutton.properties b/src/chrome/locale/bo/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/bo/torbutton.properties
+++ b/src/chrome/locale/bo/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/br/torbutton.dtd
+++ b/src/chrome/locale/br/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/br/torbutton.properties b/src/chrome/locale/br/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/br/torbutton.properties
+++ b/src/chrome/locale/br/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/bs/torbutton.dtd
+++ b/src/chrome/locale/bs/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/bs/torbutton.properties b/src/chrome/locale/bs/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/bs/torbutton.properties
+++ b/src/chrome/locale/bs/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 9d0ec7e..51601aa 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index d511726..7c077a5 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Feu clic per a activar els plugins
 torbutton.panel.plugins.enabled = Feu clic per a desactivar els plugins
 torbutton.panel.label.disabled = Tor està desactivat
 torbutton.panel.label.enabled = Tor està activat
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton us ofereix un botó per a connectar i desconnectar fàcilment Firefox a la xarxa proxy Tor
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton ha bloquejat l'activitat d'una pestanya que funcionava en un altre estat de Tor.\n\nAixò és per a prevenir els errors de programació 409737 i 417869 de Firefox.\n\nSi aquesta finestra apareix sense motiu, alguna de les vostres pestanyes intenta s'intentava carregar automàticament, i per tant, ha estat bloquejada.\n\nPer a recarregar aquesta pestanya en l'estat de Tor actiu, premeu "enter" a la direcció URL de la barra de navegació.\n\n
 torbutton.popup.plugin.warning = Torbutton ha bloquejat la càrrega directa per Tor del contingut d'un plugin.\n\nUtilitzeu l'alternativa "anomena i desa...".\n\n
 torbutton.popup.confirm_ca_certs = Nota de Torbutton: no teniu Autoritats de Certificat personalitzades. Examinar la llista d'Autoritats de Certificat és una operació lenta i ralenteix l'activació de la xarxa Tor. Voleu desactivar l'aïllament dels certificats d'Autoritats de Certificat? (si no enteneu la pregunta, és segur prémer "d'acord")
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 6c56a47..f9b8d43 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties
index 23890b9..4d1b8b6 100644
--- a/src/chrome/locale/cs/torbutton.properties
+++ b/src/chrome/locale/cs/torbutton.properties
@@ -6,7 +6,7 @@ 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 poskytuje tlaÄ?ítko k lehkému pÅ?emostÄ?ní Firefoxu na Tor Proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton zablokoval aktivitu ze záložky nahrané v jiném stavu Tor\n\nTím obeÅ¡el Firefox chyby 409737 a 417869\n\nPokud se toto vyskakovací okno zapnulo bezdůvodnÄ?, jedna z vaÅ¡ich záložek se snaží znovunaÄ?íst v pozadí a tato akce byla zablokována.\n\nPro nahrání záložky v tomto Tor stavu kliknÄ?te do adresáÅ?e a stisknÄ?te Enter\n
 torbutton.popup.plugin.warning = Torbutton zablokoval pÅ?ímé naÄ?tení obsahu plugin\n\nZkuste použít Uložit jako\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/csb/torbutton.dtd
+++ b/src/chrome/locale/csb/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/csb/torbutton.properties b/src/chrome/locale/csb/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/csb/torbutton.properties
+++ b/src/chrome/locale/csb/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/cy/torbutton.dtd
+++ b/src/chrome/locale/cy/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/cy/torbutton.properties b/src/chrome/locale/cy/torbutton.properties
index f78fbb1..2a600fb 100644
--- a/src/chrome/locale/cy/torbutton.properties
+++ b/src/chrome/locale/cy/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Cliciwch i alluogi plugins
 torbutton.panel.plugins.enabled = Cliciwch i analluogi plugins
 torbutton.panel.label.disabled = Tor Anabl
 torbutton.panel.label.enabled = Tor Galluog
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 0aec979..5dc73d4 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 84b21ef..aad3ebf 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Klik for at aktivere plugins
 torbutton.panel.plugins.enabled = Klik for at deaktivere plugins
 torbutton.panel.label.disabled = Tor Deaktiveret
 torbutton.panel.label.enabled = Tor Aktiveret
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton gør det nemt at aktivere og deaktivere Tor Proxyen ved brug af Firefox
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blokerede aktivitet fra en fane indlæst i en anden Tor-tilstand.\n\nDette sker for at omgå Firefox-fejlene 409737 og 417869.\n\nHvis denne pop-op synes at ske uden grund, så forsøger én af dine faner\nat genindlæse sig selv i baggrunden, og dette blev blokeret.\n\nFor at genindlæse fanen i denne Tor-tilstand, så tast 'Retur' URL-adressen.\n\n
 torbutton.popup.plugin.warning = Torbutton blokerede for direkte indlæsning af Tor plugin indhold.\n\nBrug 'Gem som' i stedet.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Bemærkning: Det ser ud til du ikke har nogen brugerdefinerede nøglecentre. Analysen af den globale godkendelsesmyndighedsliste er langsom og sløver skift Tor status. Vil du deaktiverer isolationen af nøglecentre certifikater? (Hvis du ikke forstår dette, er det sikkert at trykke OK)
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 20bac8b..09dd2b5 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Betriebssystem und Sprache bei Google Suchabfragen nicht übermitteln">
 <!ENTITY torbutton.prefs.transparentTor "Transparente Torification (Erfordert eigenen Transproxy oder Tor-Router)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 1d26d90..f31f709 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -6,7 +6,7 @@ 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 Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = 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)
@@ -45,8 +45,8 @@ torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorh
 torbutton.popup.short_torbrowser = Wichtige Torbutton Information!\n\nTorbutton ist jetzt immer aktiviert.\n\nKlicken sie auf den Torbutton, um mehr Informationen zu erhalten.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Diese Website (%S) hat versucht, auf Image-Daten von einem Canvas zuzugreifen. Da Canvas Image-Daten dazu benutzt werden können, um Informationen über ihren Computer zu bekommen, wurden diesmal leere Image-Daten an die Website geschickt
+canvas.allow=In zukunft Erlauben
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Niemlas für diese Website
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/dz/torbutton.dtd
+++ b/src/chrome/locale/dz/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/dz/torbutton.properties b/src/chrome/locale/dz/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/dz/torbutton.properties
+++ b/src/chrome/locale/dz/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 297b3fb..4c9628e 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Î?Ï?αίÏ?εÏ?ε Ï?ην Ï?λαÏ?Ï?Ï?Ï?μα και Ï?η γλÏ?Ï?Ï?α (Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ?) αÏ?ο Ï?α εÏ?Ï?Ï?ήμαÏ?α Ï?Ï?α κοÏ?Ï?ιά αναζήÏ?ηÏ?ηÏ?">
 <!ENTITY torbutton.prefs.transparentTor "Î?ιαÏ?ανήÏ? Torification  (Î?Ï?αιÏ?εί Ï?Ï?οÏ?αÏ?μοÏ?μένο  proxy ή Tor δÏ?ομολογηÏ?ή)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties
index 9e63138..4d4cf02 100644
--- a/src/chrome/locale/el/torbutton.properties
+++ b/src/chrome/locale/el/torbutton.properties
@@ -6,7 +6,7 @@ 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
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 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; (αν δεν καÏ?αλαβαίνεÏ?ε Ï?ο μήνÏ?μα, μÏ?οÏ?είÏ?ε να κάνεÏ?ε κλικ Ï?Ï?ο Î?Î? με αÏ?Ï?άλεια)
@@ -45,8 +45,8 @@ torbutton.popup.prompt_torbrowser = Το Torbutton λειÏ?οÏ?Ï?γεί διαÏ?
 torbutton.popup.short_torbrowser = ΣημανÏ?ική ΠληÏ?οÏ?οÏ?ία για Ï?ο Torbutton\n\nΤο Torbutton είναι Ï?Ï?Ï?α Ï?Ï?νεÏ?Ï?Ï? ενεÏ?γοÏ?οιημένο.\n\nÎ?ια Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ?, κάνεÏ?ε κλικ Ï?Ï?ο Torbutton.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
-canvas.allowAccessKey=A
-canvas.never=Never for This Site
-canvas.neverAccessKey=e
+canvas.siteprompt=Î?Ï?Ï?Ï?Ï? ο ιÏ?Ï?Ï?Ï?οÏ?οÏ? (%S) Ï?Ï?οÏ?Ï?άθηÏ?ε να αÏ?οκÏ?ήÏ?η Ï?Ï?Ï?Ï?βαÏ?η Ï?ε δεδομένα εικÏ?νÏ?ν Ï?άνÏ? Ï?ε ένα καμβά. Î?Ï?Ï? Ï?ην Ï?Ï?ιγμή Ï?οÏ? δεδομένα εικÏ?νÏ?ν Ï?ε καμβά μÏ?οÏ?οÏ?ν να Ï?Ï?ηÏ?ιμοÏ?οιηθοÏ?ν για να ανακαλÏ?Ï?θοÏ?ν Ï?ληÏ?οÏ?οÏ?ίεÏ? Ï?Ï?εÏ?ικέÏ? με Ï?ον Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ?, κενά δεδομένα εικÏ?ναÏ? εÏ?ιÏ?Ï?Ï?άÏ?ηκαν αÏ?Ï?ή Ï?η Ï?οÏ?ά.
+canvas.allow=Î?α εÏ?ιÏ?Ï?έÏ?εÏ?αι Ï?Ï?ο Î?έλλον
+canvas.allowAccessKey=Î?
+canvas.never=ΠοÏ?έ για αÏ?Ï?Ï? Ï?ον ιÏ?Ï?Ï?Ï?οÏ?ο
+canvas.neverAccessKey=ε
diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd
index c5b1af4..ccb6f48 100644
--- a/src/chrome/locale/eo/torbutton.dtd
+++ b/src/chrome/locale/eo/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/eo/torbutton.properties b/src/chrome/locale/eo/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/eo/torbutton.properties
+++ b/src/chrome/locale/eo/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 22ac5dd..4548411 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -1,147 +1,151 @@
 <!ENTITY torbutton.prefs.title "Preferencias de Torbutton">
 <!ENTITY torbutton.prefs.display_settings "Mostrar configuración">
-<!ENTITY torbutton.prefs.display_panel "Mostrar el panel de configuración de Tor en la barra de estado">
+<!ENTITY torbutton.prefs.display_panel 'Mostrar la configuración de "proxy" Tor en la barra de estado'>
 <!ENTITY torbutton.prefs.panel_format "Formato a mostrar en la barra de estado:">
 <!ENTITY torbutton.prefs.panel_text_format "Texto">
 <!ENTITY torbutton.prefs.panel_icon_format "Icono">
-<!ENTITY torbutton.prefs.tor_settings "Configuración del Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Usar la configuración de proxy recomendada para mi versión de Firefox.">
+<!ENTITY torbutton.prefs.tor_settings "Configuración para proxy">
+<!ENTITY torbutton.prefs.recommended_settings "Usar la configuración para proxy recomendada para mi versión de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Usar Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Usar Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Usar una configuración de proxy personalizada">
+<!ENTITY torbutton.prefs.custom_settings "Usar configuración para proxy personalizada">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
+<!ENTITY torbutton.prefs.proxy.host.socks "Servidor SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Puerto:">
 <!ENTITY torbutton.about.title "Acerca de Torbutton">
-<!ENTITY torbutton.about.version "version">
-<!ENTITY torbutton.about.summary "Protege la privacidad de tu navegación con Tor">
-<!ENTITY torbutton.about.code "Contribuidores de codigo:">
-<!ENTITY torbutton.about.maintainer "Mantenedores:">
-<!ENTITY torbutton.about.security_review "Revisión de Seguridad:">
-<!ENTITY torbutton.about.donate "Si te gusta usar Tor, puedes considerar">
-<!ENTITY torbutton.about.make_donation "hacer una donacion">
-<!ENTITY torbutton.pref_connection.notice "Desactive Torbutton para cambiar esta configuración.">
+<!ENTITY torbutton.about.version "Versión: ">
+<!ENTITY torbutton.about.summary "Protege la privacidad de su navegación a través de Tor">
+<!ENTITY torbutton.about.code "Contribuidores al código: ">
+<!ENTITY torbutton.about.maintainer "Mantenedor:">
+<!ENTITY torbutton.about.security_review "Revisión de la seguridad: ">
+<!ENTITY torbutton.about.donate "Si le gusta usar Tor, podría considerar ">
+<!ENTITY torbutton.about.make_donation "hacer una donación.">
+<!ENTITY torbutton.pref_connection.notice "Desactive Torbutton para cambiar estas preferencias.">
 <!ENTITY torbutton.pref_connection.more_info "Más información">
 <!ENTITY torbutton.pref_connection_more_info.title "Ayuda">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo.  Si desea cambiar la configuración de su proxy (no Tor), desactive Torbutton y regrese a este diálogo.  Si desea cambiar la configuración de Tor, use la ventana de preferencias de Torbutton.">
-<!ENTITY torbutton.context_menu.new_identity "Nueva identidad">
-<!ENTITY torbutton.context_menu.new_identity_key "Yo">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo. Si desea cambiar la configuración para proxy de su navegación sin Tor, desactive Torbutton y regrese aquí. Si desea cambiar su configuración para Tor, use la ventana de preferencias de Torbutton.">
+<!ENTITY torbutton.context_menu.new_identity "Nueva identidad (nueva instancia y conexiones de Tor)">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.toggle "Cambiar estado de Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferencias...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Acerca de Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Protecciones cookie">
+<!ENTITY torbutton.context_menu.cookieProtections "Protecciones de cookie">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copiar el URL de Tor">
-<!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Abrir el URL de Tor en una nueva pestaña">
-<!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Abrir el URL de Tor en nueva ventana">
-<!ENTITY torbutton.context_menu.openTorWindow.key "d">
+<!ENTITY torbutton.context_menu.copyTor "Copiar URL de Tor">
+<!ENTITY torbutton.context_menu.copyTor.key "U">
+<!ENTITY torbutton.context_menu.openTorTab "Abrir URL de Tor en una nueva pestaña">
+<!ENTITY torbutton.context_menu.openTorTab.key "p">
+<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL de Tor en nueva ventana">
+<!ENTITY torbutton.context_menu.openTorWindow.key "v">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Haga clic para iniciar Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Configuración de seguridad">
+<!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Preferencias de seguridad">
 <!ENTITY torbutton.prefs.block_thread "Bloquear lecturas del historial al usar Tor (crucial)">
 <!ENTITY torbutton.prefs.block_thwrite "Bloquear escrituras al historial al usar Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_nthread "Bloquear lecturas del historial mientras no se usa Tor (opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrituras al historial al no usar Tor (opcional)">
+<!ENTITY torbutton.prefs.block_nthread "Bloquear lecturas del historial al no usar Tor (opcional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrituras al historial al no usar Tor(opcional)">
 <!ENTITY torbutton.prefs.clear_history "Borrar el historial al cambiar el estado de Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquear el caché de disco de Tor y limpiarlo al cambiar el estado de Tor">
-<!ENTITY torbutton.prefs.block_cache "Bloquear el acceso a caché de memoria y disco al usar Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Almacenar cookies al no usar Tor en un jar protegido">
-<!ENTITY torbutton.prefs.cookie_protection "Utilice el diálogo de protecciones cookie para elegir">
+<!ENTITY torbutton.prefs.clear_cache "Bloquear caché de disco de Tor y limpiar toda la caché al cambiar el estado de Tor">
+<!ENTITY torbutton.prefs.block_cache "Bloquear el acceso a caché de disco y de memoria al usar Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Almacenar cookies de navegación sin Tor en un archivo .jar protegido">
+<!ENTITY torbutton.prefs.cookie_protection "Utilice el cuadro Protecciones de Cookie para elegir">
 <!ENTITY torbutton.prefs.mmm_cookies "Gestionaré manualmente mis cookies (peligroso)">
-<!ENTITY torbutton.prefs.clear_cookies "Borrar cookies al cambiar el estado de Tor">
+<!ENTITY torbutton.prefs.clear_cookies "Borrar cookies al activar Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Deshabilitar plugins al usar Tor (crucial)">
 <!ENTITY torbutton.prefs.kill_bad_js "Bloquear javascript peligroso (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Aislar contenido dinámico al usar Tor (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Bloquear contenido dinámico para el estado activo de Tor (crucial)">
 <!ENTITY torbutton.prefs.no_updates "Deshabilitar actualizaciones durante el uso de Tor">
-<!ENTITY torbutton.prefs.set_uagent "Establecer agente de usuario al usar Tor (crucial)">
+<!ENTITY torbutton.prefs.set_uagent "Establecer agente de usuario (user agent) para el uso de Tor (crucial)">
 <!ENTITY torbutton.prefs.dynamic "Contenido dinámico">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Caché">
 <!ENTITY torbutton.prefs.history "Historial">
-<!ENTITY torbutton.prefs.no_search "Deshabilitar las sugerencias de búsqueda mientras Tor está activado (recomendado)">
-<!ENTITY torbutton.prefs.shutdown "Detener">
-<!ENTITY torbutton.prefs.tor_shutdown "Eliminar las cookies de Tor cuando el navegador (con Tor) se cierre">
-<!ENTITY torbutton.prefs.all_shutdown "Eliminar cookies al cerrar el navegador">
-<!ENTITY torbutton.prefs.no_shutdown "No eliminar mis cookies al cerrar el navegador">
-<!ENTITY torbutton.prefs.disable_sessionstore "Deshabilitar el guardado de sesión (recomendado)">
+<!ENTITY torbutton.prefs.no_search "Deshabilitar sugerencias de búsqueda al usar Tor (recomendado)">
+<!ENTITY torbutton.prefs.shutdown "Cierre">
+<!ENTITY torbutton.prefs.tor_shutdown "Borrar las cookies de navegación con Tor cuando se cierre el navegador con Tor activo">
+<!ENTITY torbutton.prefs.all_shutdown "Borrar cookies para cualquier cierre del navegador">
+<!ENTITY torbutton.prefs.no_shutdown "No borrar mis cookies al cerrar">
+<!ENTITY torbutton.prefs.disable_sessionstore "Deshabilitar el guardado de sesiones (recomendado)">
 <!ENTITY torbutton.prefs.headers "Cabeceras">
-<!ENTITY torbutton.prefs.spoof_english "Simular navegador en Inglés de EEUU">
-<!ENTITY torbutton.prefs.refererspoofing "Suplantación referida">
+<!ENTITY torbutton.prefs.spoof_english "Simular navegador en inglés de EEUU">
+<!ENTITY torbutton.prefs.refererspoofing "Simulación del remitente (referer, dirección desde la que accedemos a otra)">
 <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "Burlar inteligentemente un referido durante el uso de Tor (Burla referidos entre dominios)">
+<!ENTITY torbutton.prefs.smartspoof "Simular smart referer al usar de Tor (suprime el remitente en cambios de dominio)">
 <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "Deshabilitar el almacenamiento de DOM al usar Tor (crucial)">
+<!ENTITY torbutton.prefs.disable_domstorage "Deshabilitar el almacenamiento DOM (LSOs/Flash Cookies/Supercookies) al usar Tor (crucial)">
 <!ENTITY torbutton.prefs.forms "Formularios">
-<!ENTITY torbutton.prefs.block_tforms "Bloquear el almacenamiento de contraseñas y formularios al usar Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloquear el almacenamiento de contraseñas y formularios al no usar Tor (opcional)">
+<!ENTITY torbutton.prefs.block_tforms "Bloquear el guardado de contraseñas y formularios de navegación con Tor (recomendado)">
+<!ENTITY torbutton.prefs.block_ntforms "Bloquear el guardado de contraseñas y formularios de navegación sin Tor (opcional)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Sin Tor">
-<!ENTITY torbutton.prefs.restore_tor "En el arranque de la restauración de la sesión, establecer el estado de Tor a:">
-<!ENTITY torbutton.prefs.startup_tor "En el arranque del navegador, establecer el estado de Tor:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recargar jar de cookies/eliminar cookies al fallar Firefox (recomendado)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Almacenar cookies con Tor y sin Tor en jars protegidos (peligroso)">
-<!ENTITY torbutton.prefs.clear_http_auth "Eliminar sesiones de autenticación HTTP (recomendado)">
-<!ENTITY torbutton.prefs.block_js_history "Aislar el acceso del historial de navegación al estado de Tor (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Redimensionar ventanas a múltiplos de 40px al cambiar el estado de Tor (recomendado)">
-<!ENTITY torbutton.prefs.close_tor "Cerrar las ventanas y pestañas de Tor al cambiar su estado (opcional)">
-<!ENTITY torbutton.prefs.close_nontor "Cerrar las ventanas y pestañas que no sean de Tor al cambiar el estado (opcional)">
-<!ENTITY torbutton.prefs.block_links "Bloquear los clic en vínculos y recargas de páginas desde distintos estados de Tor (opcional)">
-<!ENTITY torbutton.prefs.jar_certs "Guardar certificados SSL en jars separadas para Tor/No Tor (recomendado)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Guardar certificados CA en jars separadas para Tor/No Tor (recomendado)">
-<!ENTITY torbutton.prefs.locked_mode "Deshabilitar el botón y las teclas directas para evitar cambios accidentales">
-<!ENTITY torbutton.prefs.startup_state "En el arranque normal, establezca el estado de Tor en:">
-<!ENTITY torbutton.prefs.shutdown_state "Estado de apagado">
-<!ENTITY torbutton.prefs.startup "Arranque">
-<!ENTITY torbutton.prefs.block_tor_file_net "Bloquear el acceso de Tor a la red desde archivos en direcciones archivo:// url (recomendado)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Bloquear el acceso sin Tor a la red desde archivos en direcciones archivo:// url">
-<!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados">
-<!ENTITY torbutton.prefs.test_settings "Configuración de prueba">
-<!ENTITY torbutton.prefs.test_auto "Probar configuración Tor en cada inicio de Firefox a partir de la primera a activación">
+<!ENTITY torbutton.prefs.restore_tor "Durante un arranque con restauración de sesión, establecer el estado de Tor a: ">
+<!ENTITY torbutton.prefs.startup_tor "Durante el arranque del navegador, establecer el estado de Tor a:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Recargar archivo .jar de cookies/borrar cookies al fallar Firefox (recomendado)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Almacenar juntas cookies de navegación con Tor y sin Tor en archivos .jar protegidos (peligroso)">
+<!ENTITY torbutton.prefs.clear_http_auth "Borrar sesiones de autentificación HTTP (recomendado)">
+<!ENTITY torbutton.prefs.block_js_history "Bloquear el acceso al historial de navegación para el estado activo de Tor (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Redimensionar ventanas a múltiplos de 50px al usar Tor (recomendado)">
+<!ENTITY torbutton.prefs.close_tor "Cerrar todas las ventanas y pestañas cargadas con Tor al cambiar el estado (opcional)">
+<!ENTITY torbutton.prefs.close_nontor "Cerrar todas las ventanas y pestañas cargadas sin Tor al cambiar el estado (opcional)">
+<!ENTITY torbutton.prefs.block_links "Bloquear los clics sobre enlaces y las recargas de página provenientes de estados de Tor distintos al actual (opcional)">
+<!ENTITY torbutton.prefs.jar_certs "Almacenar certificados SSL en archivos .jar separados por estados Tor/sin Tor (recomendado)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Almacenar certificados de Autoridades de Certificados (CAs) en archivos .jar separados por estados Tor/sin Tor (recomendado)">
+<!ENTITY torbutton.prefs.locked_mode "Deshabilitar botón y atajos de teclado para prevenir cambios de estado accidentales">
+<!ENTITY torbutton.prefs.startup_state "Durante el arranque normal, establecer el estado de Tor a:">
+<!ENTITY torbutton.prefs.shutdown_state "Estado al cierre">
+<!ENTITY torbutton.prefs.startup "Arranque ">
+<!ENTITY torbutton.prefs.block_tor_file_net "Bloquear el acceso a la red con Tor desde URLs de archivo local file:// (recomendado) ">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Bloquear el acceso a la red sin Tor desde URLs de archivo local file:// ">
+<!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados ">
+<!ENTITY torbutton.prefs.test_settings "Probar configuración">
+<!ENTITY torbutton.prefs.test_auto "Probar mi configuración de Tor desde la primera activación cada vez que inicie Firefox">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "No escribir en el disco las cookies de Tor">
-<!ENTITY torbutton.prefs.nontor_memory_jar "No escribir en el disco las cookies que no sean de Tor">
-<!ENTITY torbutton.prefs.session_restore "Hacer que el almacenamiento de la sesión guarde y restablezca estas pestañas">
-<!ENTITY torbutton.prefs.nontor_tabs "Pestañas cargadas fuera de Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Pestañas cargadas en Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "No escribir en el disco las cookies de navegación con Tor">
+<!ENTITY torbutton.prefs.nontor_memory_jar "No escribir en el disco las cookies de navegación sin Tor">
+<!ENTITY torbutton.prefs.session_restore "Hacer que session store (almacenamiento de sesión de Firefox) guarde y restaure estas pestañas: ">
+<!ENTITY torbutton.prefs.nontor_tabs "Pestañas cargadas sin Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Pestañas cargadas con Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No hay proxies para:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Advertencia: Evite el uso de nombres de host por encima de">
-<!ENTITY torbutton.prefs.spoofreresh "Actualizar Burlado">
-<!ENTITY torbutton.prefs.refereroptions "Opciones de Referido de suplantación">
-<!ENTITY torbutton.prefs.nospoof "No referer parodia">
-<!ENTITY torbutton.prefs.spoofroot "Burlar de la carpeta que contiene la página">
-<!ENTITY torbutton.prefs.spoofdomain "Burlar el dominio como referido">
-<!ENTITY torbutton.prefs.spoofblank "Hacer un referido en blanco">
-<!ENTITY torbutton.cookiedialog.title "Administrar protecciones cookie">
+<!ENTITY torbutton.prefs.no_proxies_on "Sin proxys para: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Advertencia: Evite usar los nombres de servidor (host) citados arriba">
+<!ENTITY torbutton.prefs.spoofreresh "Simular refresco de página">
+<!ENTITY torbutton.prefs.refereroptions "Opciones de simulación del referer (remitente, dirección desde la que accede a la actual)">
+<!ENTITY torbutton.prefs.nospoof "No simular referer">
+<!ENTITY torbutton.prefs.spoofroot "Simular la dirección de la carpeta que contiene la página">
+<!ENTITY torbutton.prefs.spoofdomain "Simular que el dominio de la página es el referer">
+<!ENTITY torbutton.prefs.spoofblank "Poner en blanco el referer">
+<!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegidas">
-<!ENTITY torbutton.cookiedialog.domainCol "hospedaje">
+<!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)">
 <!ENTITY torbutton.cookiedialog.nameCol "Nombre">
 <!ENTITY torbutton.cookiedialog.pathCol "Ruta">
 <!ENTITY torbutton.cookiedialog.protectCookie "Proteger cookie">
 <!ENTITY torbutton.cookiedialog.removeCookie "Eliminar cookie">
 <!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Remover todas excepto las protegidas">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Deshabilitar las marcas de actualizaciones durante el uso de Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Deshabilitar actualizaciones de marcadores dinámicos (livemarks) al usar 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 "Redireccionar las actualizaciones de Torbutton a través de Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automáticamente utilice un motor de busqueda alterno cuando se presente con un Captcha de Google">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirigir las actualizaciones de Torbutton a través de Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Usar automáticamente un motor de busqueda alternativo cuando se encuentre un captcha de Google ">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
+<!ENTITY torbutton.prefs.engine2 "bing.com">
+<!ENTITY torbutton.prefs.engine3 "yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
-<!ENTITY torbutton.prefs.fix_google_srch "Quitar plataforma y lenguaje de los Cuadros de petición de busqueda de Google">
-<!ENTITY torbutton.prefs.transparentTor "Torificación transparente (Requiere transproxy personalizado o router Tor)">
+<!ENTITY torbutton.prefs.fix_google_srch "Despojar de información de sun plataforma e idioma a las consultas en los cuadros de busqueda de Google">
+<!ENTITY torbutton.prefs.transparentTor "Torificación transparente (requiere un transproxy personalizado o un router Tor)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 8d5eea9..3174eb0 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -2,51 +2,51 @@ torbutton.button.tooltip.disabled = Habilitar Tor
 torbutton.button.tooltip.enabled = Deshabilitar Tor
 torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor
 torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor
-torbutton.panel.plugins.disabled = Haga clic para habilitar componentes.
-torbutton.panel.plugins.enabled = Haga clic para deshabilitar componentes.
+torbutton.panel.plugins.disabled = Haga clic para habilitar extensiones (plugins).
+torbutton.panel.plugins.enabled = Haga clic para deshabilitar extensiones (plugins).
 torbutton.panel.label.disabled = Tor deshabilitado
 torbutton.panel.label.enabled = Tor habilitado
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton proporciona un botón para habilitar y deshabilitar el acceso al proxy Tor desde el Firefox de manera fácil.
-torbutton.popup.history.warning = Torbutton bloqueo actividad de una pestaña cargada en un estado diferente de Tor.\n\nEsto es para circunvenir los errores de programación 409737 y 417869 de Firefox.\n\nSi esta ventana aparece sin ninguna razón aparente, una de sus pestañas esta intentando recargarse en el background  y esta operación ha sido bloqueada.\n\nPara recargar esta pestaña en el estado actual de Tor, presione la tecla  'enter' en el cuadro \n
-torbutton.popup.plugin.warning = Torbutton bloqueó la carga directa por Tor del contenido de un componente.\n\nUse la alternativa de â??Guardar Comoâ??.\n\n
-torbutton.popup.confirm_ca_certs = Nota de Torbutton: Parece que usted no tiene Autoridades de Certificado personalizadas. Examinar el listado de Autoridades de Certificado es una operación lenta y hace más lento el conmutador Tor. ¿Desea deshabilitar el aislamiento de los certificados de Autoridades de Certificado? (Si no entiende esto, se más seguro hacer clic en Aceptar)
-torbutton.popup.ff3.warning = ¡Advertencia!\n\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona horaria y la marcas a través de Tor.\n\n¿Desea continuar de todos modos?
-torbutton.popup.toggle.warning = Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en efecto.
-torbutton.popup.test.success = ¡La prueba del proxy Tor finalizó con éxito!
-torbutton.popup.test.failure = ¡La prueba del proxy Tor FALL�! Revise las preferencias de su Proxy y de Polipo.
-torbutton.popup.test.confirm_toggle = La prueba más reciente de Tor proxy fallo al usar Tor.\n\n¿Estás seguro de que desea habilitar de todos modos?\n\nNota: Si usted ha solucionado el problema, puede volver a ejecutar la prueba en la ventana de Preferencias de Proxy Torbutton para eliminar esta advertencia.
-torbutton.popup.test.ff3_notice = Haga clic en Aceptar para probar las preferencias del proxy Tor. Esta prueba se hará en segundo plano. Por favor, tenga paciencia.
-torbutton.panel.label.verified = El Tor se verificó
-torbutton.popup.test.auto_failed = Las prueba automática del proxy Tor no pudo usar el Tor.\n ¿Está seguro de que desea habilitarlo de todos modos?
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton bloqueo la actividad de una pestaña cargada en un estado diferente de Tor. \n \nEsto es para evitar los errores de programación 409737 y 417869 de Firefox.\n\nSi este diálogo aparece sin ninguna razón aparente, una de sus pestañas está intentando recargarse en segundo plano, y esta operación ha sido bloqueada.\n\nPara recargar esta pestaña en el estado actual de Tor, presione la tecla  'enter' en la barra de dirección URL. \n \n
+torbutton.popup.plugin.warning = Torbutton bloqueó la carga directa por Tor del contenido del plugin.\n\nUse â??Guardar comoâ?? en su lugar.\n\n
+torbutton.popup.confirm_ca_certs = Nota de Torbutton: Parece que no tiene Autoridades de Certificados (CA) personalizadas. Examinar la lista por defecto de CAs es una operación lenta y ralentiza la activación de Tor. ¿Desea deshabilitar el aislamiento de los certificados de CAs? (Permite verificar certificados con las CAs que los firmaron si a su vez están certificadas, sin tener que buscar a qué cadena de confianza de qué CA de la lista correspondería. Si no entiende esto, hacer clic en Aceptar es seguro)
+torbutton.popup.ff3.warning = ¡Advertencia!\n\nTorbutton sobre Firefox 3 es conocido por revelar su zona horaria y marcadores activos (livemarks) a través de Tor.\n\n¿Desea continuar de todos modos?
+torbutton.popup.toggle.warning = Tiene que activar Tor o reiniciar para que sus preferencias sean aplicadas.
+torbutton.popup.test.success = ¡La prueba con "proxy" Tor finalizó con éxito!
+torbutton.popup.test.failure = ¡La prueba con "proxy" Tor FALL�! Revise su configuración para proxy y Polipo.
+torbutton.popup.test.confirm_toggle = La prueba más reciente con "proxy" Tor falló al usar Tor.\n\n¿Está seguro de que quiere habilitarlo de todos modos?\n\nNota: Si ha solucionado el problema, puede volver a ejecutar la prueba en la ventana de Preferencias para proxy de Torbutton para eliminar esta advertencia.
+torbutton.popup.test.ff3_notice = Haga clic en Aceptar para probar las preferencias para "proxy" Tor. Esta prueba se hará en segundo plano. Por favor, tenga paciencia.
+torbutton.panel.label.verified = Tor verficado
+torbutton.popup.test.auto_failed = La prueba automática con "proxy" Tor falló al usar Tor.\n \n¿Está seguro de que quiere habilitarlo de todos modos?
 torbutton.prefs.recommended = (recomendado)
 torbutton.prefs.optional = (opcional)
 torbutton.prefs.crucial = (crucial)
-torbutton.popup.external.title = Cargar contenido externo?
-torbutton.popup.external.app = Una aplicación externa es necesaria para manejar:\n\n
-torbutton.popup.external.note = \n\nNOTA: Las aplicaciones externasa NO son de uso seguro para Tor por defecto y podrían desenmascararlo!\n
-torbutton.popup.external.suggest = \nSi este archivo no es de confianza, debe guardarlo o verlo mientras está desconectado de internet on en una VM.\no considere usar un proxy Tor transparente como Tails LiveCD o torsocks.\n
-torbutton.popup.launch = Iniciar la aplicación
+torbutton.popup.external.title = ¿Cargar contenido externo?
+torbutton.popup.external.app = Es necesaria una aplicación externa para abrir el archivo:\n\n
+torbutton.popup.external.note = \n\nNOTA: ¡Las aplicaciones externas por defecto NO son de uso seguro para Tor y podrían desenmascararle (v.g. estableciendo alguna conexión sin pasar por Tor)!\n
+torbutton.popup.external.suggest = \nSi este archivo no es de confianza, debería bien guardarlo para verlo\ncuando esté desconectado o en una máquina virtual (VM), o bien\nconsiderar usar un "proxy" Tor transparente (que torifica todas las aplicaciones sin configurarlas) como Tails LiveCD o torsocks.\n
+torbutton.popup.launch = Arrancar aplicación
 torbutton.popup.cancel = Cancelar
-torbutton.popup.dontask = A partir de ahora, siempre iniciar la aplicación
-torbutton.popup.test.no_http_proxy = Prueba de Tor proxy: Local Proxy HTTP es inalcanzable. Polipo está funcionando correctamente?
-torbutton.popup.captcha.title = Evitar los Captchas de Google?
-torbutton.popup.captcha.ask = Torbutton detectó un Captcha Google. Querría ser redirecionado a otro motor de busqueda para esta?
-torbutton.popup.captcha.always = Siempre realice esta acción a partir de este momento.
-torbutton.popup.redirect = Redireccionar
-torbutton.popup.no_redirect = No redireccionar
-torbutton.popup.prompted_language = Para más privacidad, Torbutton puede solicitar la versión en Inglés de las páginas web. Esto puede causar que las páginas que usted preferiría leer en su idioma se muestren en Inglés.\n\n¿Le gustaría solicitar páginas web en Inglés para más privacidad?
-torbutton.popup.no_newnym = Torbutton no puede darle una nueva identidad de forma segura. No tiene acceso al Puerto de Control Tor.\n\n¿Está ejecutando el Paquete de navegador Tor?
-torbutton.popup.use_tbb = Parece que está usando Torbutton con Firefox, lo cuál ya no es una configuración segura recomendada.\n\nComo alternativa, le recomendamos obtener el último Paquete de navegador Tor enviando un correo electrónico a gettor@xxxxxxxxxxxxxx o descargándolo en la siguiente URL:
-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.popup.dontask = En adelante arrancar aplicaciones siempre
+torbutton.popup.test.no_http_proxy = Prueba con "proxy" Tor: El proxy HTTP local es inalcanzable. ¿Está Polipo funcionando correctamente?
+torbutton.popup.captcha.title = ¿Evitar los captchas de Google?
+torbutton.popup.captcha.ask = Torbutton detectó un captcha de Google. ¿Desea que su petición sea redirigida a otro motor de búsqueda?
+torbutton.popup.captcha.always = En adelante realizar siempre esta acción
+torbutton.popup.redirect = Redirigir
+torbutton.popup.no_redirect = No redirigir
+torbutton.popup.prompted_language = Para darle mayor privacidad, Torbutton puede solicitar la versión en inglés de las páginas web. Esto podría causar que páginas que prefiera leer en su idioma nativo se muestren en inglés en su lugar. \n \n¿Le gustaría solicitar páginas web en inglés para mejor privacidad?
+torbutton.popup.no_newnym = Torbutton no puede darle una nueva identidad (instancia de Tor) de forma segura. No tiene acceso al puerto de control de Tor (ControlPort)\n\n¿Está ejecutando el Paquete de Navegador Tor?
+torbutton.popup.use_tbb = Parece que está usando Torbutton con Firefox, cuya combinación dejó de ser una configuración segura recomendada.\n\nEn su lugar, recomendamos que obtenga el último Paquete de Navegador Tor enviando un correo a gettor@xxxxxxxxxxxxxx o descargándolo en la siguiente URL: 
+torbutton.popup.pref_error = Torbutton no puede actualizar las preferencias en la carpeta de perfiles del Navegador Tor.
+torbutton.popup.permission_denied = Permiso denegado: reinicie los permisos de la carpeta del Navegador Tor o bien cópielo a una nueva ubicación.
+torbutton.popup.device_full = El disco parece estar lleno. Libere espacio o mueva el Navegador Tor a un nuevo dispositivo.
 torbutton.title.prompt_torbrowser = Información importante sobre Torbutton
-torbutton.popup.prompt_torbrowser = Torbutton funciona diferente ahora: ya no lo podrá apagar.\n\n\nCambiamos esto porque creemos que no es seguro utilizar Torbutton en un navegador que se utilice para navegar sin Tor. Hubieron demasiados fallos por esto que no podamos arreglar de otra manera.\n\nSi quiere seguir usando Firefox normalmente, debería desinstalar Torbutton y descargar el Tor Browser Bundle. Las propiedades de privacidad de Tor Browser son superiores a las de Firefox, aún cuando éste se use con Torbutton.\n\nPara eliminar Torbutton. vaya a Herramientas->Complementos->Extensiones y haga clic en el botón Eliminar próximo a Torbutton.
-torbutton.popup.short_torbrowser = Información importante sobre Torbutton: Torbutton ahora siempre estará encendido. Haga clic en el Torbutton para más información
+torbutton.popup.prompt_torbrowser = Torbutton ahora funciona de manera diferente: ya no lo podrá apagar más. \n \nHicimos este cambio porque no es seguro utilizar Torbutton en un navegador que también se utilice para navegar sin Tor. Hubo tantos fallos con esto que no pudimos arreglarlo de otro modo. \n \nSi quiere seguir usando Firefox normalmente, debería desinstalar Torbutton y descargar el Paquete de Navegador Tor. Las propiedades de privacidad del Navegador Tor son superiores a las de un Firefox normal, incluso cuando se usa Firefox con Torbutton. \n \nPara eliminar Torbutton. vaya a Herramientas->Complementos->Extensiones y haga clic en el botón Eliminar próximo a Torbutton.
+torbutton.popup.short_torbrowser = ¡Información importante sobre Torbutton! \n \nTorbutton ahora está siempre encendido. \n \nHaga clic en (el botón de) Torbutton para más información.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
-canvas.allowAccessKey=A
-canvas.never=Never for This Site
-canvas.neverAccessKey=e
+canvas.siteprompt=Este sitio web (%S) trató de acceder a los metadatos de una imagen. Como los metadatos de la imágenes puede usarse para revelar información acerca de su computadora, en esta ocasión se ha respondido con metadatos en blanco.
+canvas.allow=Permitir en el futuro
+canvas.allowAccessKey=P
+canvas.never=Nunca para este sitio
+canvas.neverAccessKey=u
diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd
index 6f0926d..448b34f 100644
--- a/src/chrome/locale/et/torbutton.dtd
+++ b/src/chrome/locale/et/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/et/torbutton.properties b/src/chrome/locale/et/torbutton.properties
index 8a87922..a642b1b 100644
--- a/src/chrome/locale/et/torbutton.properties
+++ b/src/chrome/locale/et/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor on mitteaktiivne
 torbutton.panel.label.enabled = Tor on aktiivne
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton pakub lihtsat võimalust panna Firefox kasutama Tori või võtta Firefox kasutamast Tori.
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blokeeris Tori otse laadimast plugina sisu.\n\nKasuta "Salvesta nimega" selle asemel.\n\n
 torbutton.popup.confirm_ca_certs = Torbuttoni teade: tundub, et sul pole ühtegi iselisatud sertifikaadi autoriteeti. Sertifikaadi autoriteetite nimekirja uurimine on aeglane tegevus ning aeglustab Tori kasutamise ja mittekasutamise vahetamist. Kas sa soovid lõpetada sertifikaadi autoriteetide isoleerimise? (Kui sa ei mõista, millest jutt käib, siis võid julgelt seda teha.)
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 1495c6b..bfdd37b 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index dfe7ae5..1be4856 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Sakatu gehigarriak gaitzeko
 torbutton.panel.plugins.enabled = Sakatu gehigarriak ezgaitzeko
 torbutton.panel.label.disabled = Tor Ezgaitua
 torbutton.panel.label.enabled = Tor Gaitua
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton botoi bat ematen du Firefoxek Tor proxyra seinalatzea erraz gaitu edo ezgaitzeko.
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 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)
@@ -41,12 +41,12 @@ torbutton.popup.pref_error = Torbuttonek ezin ditu Tor Browser profilaren direkt
 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 = Torbutton informazio garratzitsua
-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.
+torbutton.popup.prompt_torbrowser = Torbuttonek ezberdin egiten du lan orain: ezin da gehiago itzali.\n\nTor kanpoko nabigatzea ere egiteko erabiltzen den nabigatzaile batean Torbutton erabiltzea segurura ez delako aldaketa hau egin dugu. Beste era batean konpondu ezin genituen akats asko zeuden.\n\nFirefox modu arruntean erabiltzen jarraitu nahi baduzu, Torbutton kendu beharko zenuke eta Tor Browser Bundlea deskargatu. Tor Browserren pribatutasun ezaugarriak Firefox arruntarenak baino hobeak dia, baita Firefox Torbuttonekin erabiltzen bada ere.\n\nTorbutton kentzeko, joan hona Tresnak->Gehigarriak->Hedapenak eta Torbuttonen ondoan dagoen Kendu botoian sakatu.
+torbutton.popup.short_torbrowser = Torbutton informazio garrantzitsua!\n\nTorbutton orain beti gaituta dago.\n\nSakatu Torbuttonen informazio gehiago lortzeko.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Webgune honek (%S) oihal bateko irudi datuetara sartzen saiatu da. Oihalen irudi datuak zure ordenagailuari buruzko informazioa ezagutzeko erabil daitezkeenez, irudi datu zuria itzuli da oraingoan.
+canvas.allow=Baimendu etorkizunean
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Inoiz gune honetarako
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 6882cba..8aba4a7 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "اطÙ?اعات Ù?ربÙ?Ø· بÙ? Ù?Ù?ع سÙ?ستÙ? عاÙ?Ù? Ù? Ù?رÙ?رگر Ù? زباÙ? Ù?Ù?رد استÙ?ادÙ? Ø´Ù?ا را از Ù?رÙ?دÛ?â??Ù?اÛ? جستجÙ?گر Ú¯Ù?Ú¯Ù? حذÙ? Ú©Ù?">
 <!ENTITY torbutton.prefs.transparentTor "سازگارسازÛ? با تÙ?ر بÙ? صÙ?رت Ø´Ù?اÙ? (Ù?Ù?از بÙ? رÙ?Ù?اب تÙ?ر Ù?ا Tor router Ù? Ù?ا transproxy سÙ?ارشÛ? دارد)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index c278f13..8a50f68 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = براÛ? Ù?عاÙ? کردÙ? Ù¾Ù?اگÙ?Ù? Ù?ا
 torbutton.panel.plugins.enabled = براÛ? غÙ?رÙ?عاÙ? کردÙ? Ù¾Ù?اگÙ?Ù? Ù?ا Ú©Ù?Ù?Ú© Ú©Ù?Ù?د
 torbutton.panel.label.disabled = تÙ?رغÙ?رÙ?عاÙ? شد
 torbutton.panel.label.enabled = تÙ?ر Ù?عاÙ? شد
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = دکÙ?Ù? تÙ?ر بÙ? آساÙ?Û? اÙ?کاÙ? Ù?عاÙ? Ù? غÙ?رÙ?عاÙ? کردÙ? پراکسÛ? تÙ?ر را بکÙ?Ú© Ù?Ú© دکÙ?Ù? Ù?Û? دÙ?د
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = TorbuttonÙ?عاÙ?Ù?ت تب Ù?اÙ? Ù?Ù? بغÙ?ر از تÙ?ر Ù?تصÙ? Ù?Ù? Ø´Ù?Ù?د را Ù?سدÙ?د Ù?Ù? Ù?Ù?د/n/nThis is to work around Firefox Bugs 409737 and 417869/n/nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = دکÙ?Ù? تÙ?ر Ù?اÙ?ع از Ù?صب Ø®Ù?دکار Ù?Ú© Ù¾Ù?اگÙ?Ù? شد.\n\nدر عÙ?ض Save-As را بکار ببرÙ?د.\n\n
 torbutton.popup.confirm_ca_certs = Ù?Ù?تÙ? : بÙ?ظر Ù?Ù? رسد Ú©Ù? Ø´Ù?ا داراÛ? اسÙ?اد سÙ?ارشÛ? Ù?Ù?Û? باشÙ?د. بازرسÛ? Ù?Ù?ست اسÙ?اد زÙ?اÙ? Ù?Û? برد Ù? Ù?Ù?جب Ú©Ù?دÛ? عÙ?Ù?کرد ضاÙ?Ù? تÙ?ر Ù?Û? Ø´Ù?د. Ø¢Ù?ا Ù?Û? Ø®Ù?اÙ?Ù?د جداسازÛ? اسÙ?اد را غÙ?رÙ?عاÙ? Ú©Ù?Ù?دØ? (اگر Ù?تÙ?جÙ? Ù?عÙ?Û? Ù?Ù?Û? Ø´Ù?Ù?د, بÙ?تر است رÙ?Û? بسÙ?ارخÙ?ب Ù?شار دÙ?Ù?د)
@@ -40,7 +40,7 @@ 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.title.prompt_torbrowser = اطÙ?اعات Ù?Ù?Ù? Torbutton
 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.dtd b/src/chrome/locale/fi/torbutton.dtd
index 3cad5aa..e64ec57 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Poista yksilöintitiedot (laitteisto ja kieliasetukset) Google hakuja suoritettaessa ">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index b1914a3..0667165 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Salli lisäosat napsauttamalla
 torbutton.panel.plugins.enabled = Estä lisäosat napsauttamalla
 torbutton.panel.label.disabled = Tor pois käytöstä.
 torbutton.panel.label.enabled = Tor käytössä.
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbuttonin avulla Firefox saadaan helposti käyttämään tai poistamaan käytöstä Tor välityspalvelin 
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 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)
diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/fil/torbutton.dtd
+++ b/src/chrome/locale/fil/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fil/torbutton.properties b/src/chrome/locale/fil/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/fil/torbutton.properties
+++ b/src/chrome/locale/fil/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/fo/torbutton.dtd
+++ b/src/chrome/locale/fo/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fo/torbutton.properties b/src/chrome/locale/fo/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/fo/torbutton.properties
+++ b/src/chrome/locale/fo/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 2e21353..f47d093 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Supprimer les informations relatives à la plateforme et à la langue des requêtes Google">
 <!ENTITY torbutton.prefs.transparentTor "Torification transparente (requiert un transproxy personnalisé ou un routeur Tor)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index e0a3408..5177833 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Cliquer pour activer les plugins
 torbutton.panel.plugins.enabled = Cliquer pour désactiver les plugins
 torbutton.panel.label.disabled = Tor Inactif
 torbutton.panel.label.enabled = Tor Actif
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton fournit un bouton qui permet d'activer et de désactiver rapidement le pointage de Firefox vers le proxy de Tor
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton a bloqué l'activité provenant d'un onglet ouvert dans un état Tor différent.\n\nCeci permet de contourner les bugs Firefox 409737 et 417869.\n\nSi ce message d'erreur semble apparaître sans raison, un de vos onglets est en train de se rafraîchir en l'arrière-plan, et il a été bloqué.\n\nAfin de rafraîchir l'onglet dans l'état Tor actuel, faire "entrer" dans barre d'adresse de l'URL.\n\n
 torbutton.popup.plugin.warning = Torbutton a bloqué le chargement direct par Tor du contenu du plugin.\n\nUtiliser plutôt la fonction Enregistrer sous.\n\n
 torbutton.popup.confirm_ca_certs = Info Torbutton: Vous n'avez pas de Certificat d'Autorité personnalisé. Examiner la liste des Certificats d'Autorité est une opération lente qui ralentit la bascule vers Tor. Voulez-vous désactiver l'isolation des Certificats d'Autorité ? (Si vous ne comprenez pas, il est bon de répondre OK)
@@ -45,8 +45,8 @@ torbutton.popup.prompt_torbrowser = Torbutton fonctionne différemment maintenan
 torbutton.popup.short_torbrowser = Information importante concernant Torbutton!\n\nTorbutton est dorénavant toujours activé.\n\nCliquer sur Torbutton pour plus d'informations.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Ce site web (%S) a essayé dâ??accéder aux données dâ??une image incluse dans un canvas. Puisque ce procédé peut être utilisé pour découvrir des informations concernant votre ordinateur, une image vide a été utilisée à la place cette fois-ci.
+canvas.allow=Autoriser à lâ??avenir
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Jamais pour ce site
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fur/torbutton.properties b/src/chrome/locale/fur/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/fur/torbutton.properties
+++ b/src/chrome/locale/fur/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/fy/torbutton.dtd
+++ b/src/chrome/locale/fy/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/fy/torbutton.properties b/src/chrome/locale/fy/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/fy/torbutton.properties
+++ b/src/chrome/locale/fy/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ga/torbutton.properties
+++ b/src/chrome/locale/ga/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/gl/torbutton.properties b/src/chrome/locale/gl/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/gl/torbutton.properties
+++ b/src/chrome/locale/gl/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index 73d91f4..8be09a3 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/gu/torbutton.properties b/src/chrome/locale/gu/torbutton.properties
index bee55b0..2452d7d 100644
--- a/src/chrome/locale/gu/torbutton.properties
+++ b/src/chrome/locale/gu/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = પ�લ��ન�સ સ��રિય 
 torbutton.panel.plugins.enabled = પ�લ��ન�સ નિષ���રિય �રવા ��લિ� �ર�
 torbutton.panel.label.disabled = ��ર નિષ���રિય
 torbutton.panel.label.enabled = ��ર સ��રિય
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/gun/torbutton.dtd
+++ b/src/chrome/locale/gun/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/gun/torbutton.properties b/src/chrome/locale/gun/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/gun/torbutton.properties
+++ b/src/chrome/locale/gun/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ha/torbutton.dtd
+++ b/src/chrome/locale/ha/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ha/torbutton.properties b/src/chrome/locale/ha/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ha/torbutton.properties
+++ b/src/chrome/locale/ha/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 0c22f89..874b3bf 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -18,10 +18,10 @@
 <!ENTITY torbutton.about.title "×?×?×?×?ת Torbutton">
 <!ENTITY torbutton.about.version "×?רס×?:">
 <!ENTITY torbutton.about.summary "×?×?×? ×¢×? ×?פר×?×?×?ת ש×? ×?×?×?שת ×?-Tor ש×?×?">
-<!ENTITY torbutton.about.code "Code Contributors:">
-<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.code "×?שתתף ×?×?ת×?×?ת ק×?×?:">
+<!ENTITY torbutton.about.maintainer "×?ת×?×?ק:">
 <!ENTITY torbutton.about.security_review "ס×?ק×?ר ×?×?×?×?×?">
-<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.donate "×?×? ×?ת×? ×?×?×?×? ×?×?שת×?ש ×?Tor, ×?×?×?×? ×?×?×?×? שתשק×?×?">
 <!ENTITY torbutton.about.make_donation "×?תר×?×?">
 <!ENTITY torbutton.pref_connection.notice "×?ש×?ת ×?ת Torbutton ×¢×? ×?נת ×?שנ×?ת ×?×?×?ר×?ת ×?×?×?">
 <!ENTITY torbutton.pref_connection.more_info "×?×?×?×¢ × ×?סף">
@@ -78,52 +78,52 @@
 <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.prefs.smartspoof "×?×?×?×?×£ referer ×?×?×? ×?×?×?×?×? ש×?×?×?ש ×?×?ר (×?ש×?×?×?×? ×?×?×?×?×£ צ×?×?×? ×?×?×?×?×?×?)">
 <!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.disable_domstorage "×?×?×? ×?×?ס×?×? DOM ×?×?×?×?×? ש×?×?×?ש ×?Tor (×?×?×?× ×?)">
 <!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 "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.restore_tor "×?×?פע×?ת ×?פ×?ש ×?ש×?×?×?ר, ק×?×¢ ×?×?×?× ×?×?ת Tor:">
 <!ENTITY torbutton.prefs.startup_tor "×?×?פע×?ת ×?×?פ×?פ×?, ק×?×¢ ×?ת ×?×?צ×? ש×? Tor ×?:">
-<!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.reload_crashed_jar "רענ×? צנצנת ×¢×?×?×?×?ת / ×¢×?×?×?×?ת ×?ר×?ר×?ת ×¢×? פ×?×?רפ×?קס ×?קר×?ס (×?×?×?×?×¥)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "×?×?ס×? שת×? ×¢×?×?×?×?ת Tor ×?Non- Tor ×?צנצנ×?ת ×?×?×?× ×?ת (×?ס×?×?×?)">
 <!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.block_js_history "×?×?×?×?×? ×?ת ×?×?×?ש×? ×?× ×?×?×?×? ×?×?×?ס×?×?ר×?ת ×?×?×?× ×?×?ת Tor (×?×?×?× ×?)">
+<!ENTITY torbutton.prefs.resize_on_toggle "ש×?× ×?×? ×?×?×?×? ×?×?×?× ×?ת ×?×?פ×?×?×?ת ש×? 50 פ×?קס×?×?×? ×?×?×?×?×? ש×?×?×?ש ×?Tor (×?×?×?×?×¥)">
+<!ENTITY torbutton.prefs.close_tor "ס×?×?ר ×?ת ×?×? ×?×?×?×?× ×?ת ×?×?ש×?× ×?×?ת Tor ×¢×? Toggle (×?×?פצ×?×?× ×?×?)">
+<!ENTITY torbutton.prefs.close_nontor "ס×?×?ר ×?ת ×?×? ×?×?×?×?× ×?ת Non- Tor ×?×?ר×?×?ס×?×?ת Toggle (×?×?פצ×?×?× ×?×?)">
+<!ENTITY torbutton.prefs.block_links "×?ס×?×? ×?×?×?צ×?ת ק×?ש×?ר ×?ש×?×?×?ר ×?פ×?×? ×?×?×?×?×?× ×?ת ש×?× ×?ת Tor (×?×?פצ×?×?× ×?×?)">
+<!ENTITY torbutton.prefs.jar_certs "×?× ×?ת SSL ס×?×?ר×?×?ת ×?צנצנ×?ת נפר×?×?ת Tor / ×?Non- Tor (×?×?×?×?×¥)">
 <!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.locked_mode "×?ש×?ת ×?פת×?ר ×?×?קש×? ק×?צ×?ר ×?×?×? ×?×?× ×?×¢ Toggle ×?קר×?">
+<!ENTITY torbutton.prefs.startup_state "×?×?פע×?×? ר×?×?×?×?, ק×?×¢ ×?×?×?× ×?×?ת Tor:">
+<!ENTITY torbutton.prefs.shutdown_state "×?צ×? ×?×?×?×?×?">
 <!ENTITY torbutton.prefs.startup "×?פע×?×?">
 <!ENTITY torbutton.prefs.block_tor_file_net "×?ס×?×? ×?×?שת Tor ×?רשת ×?×?ת×?×?×?ת file:// (×?×?×?×?×¥)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "×?ס×?×? ×?×?ש×? ×?×? ש×? Tor ×?רשת ×?×?ת×?×?×?ת file://">
 <!ENTITY torbutton.prefs.restore_defaults "×?×?ר×? ×?×?ר×?רת ×?×?×?×?">
 <!ENTITY torbutton.prefs.test_settings "×?×?×? ×?×?×?ר×?ת">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.test_auto "×?×?×?ק ×?ת ×?×?×?ר×?ת Tor ש×?×? ×?×?ר×? ×?פע×? ×?ר×?ש×?× ×? ש×?× ×? Toggle ×¢×? ×?×? ×?ת×?×?×? ש×? פ×?×?רפ×?קס">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "×?×? ת×?ת×?×? ק×?ק×?×? ש×? Tor ×?×?×?סק ×?קש×?×?">
 <!ENTITY torbutton.prefs.nontor_memory_jar "×?×? ת×?ת×?×? ק×?ק×?×? ×?×? ש×? Tor ×?×?×?סק ×?קש×?×?">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!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 "×?×?×? פר×?קס×?×? ×¢×?×?ר:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
-<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "×?×? ×?×?×?×?×£ ×?פנ×? ×?×?×?×?×? ש×?×?×?ש ת×?ר (ש×?×?×? ×?ש×?×?×?×?×? ×?ר×?×?×?)">
-<!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.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 "Host">
+<!ENTITY torbutton.cookiedialog.domainCol "×?×?ר×?">
 <!ENTITY torbutton.cookiedialog.nameCol "ש×?">
 <!ENTITY torbutton.cookiedialog.pathCol "×?×¢×?ר">
 <!ENTITY torbutton.cookiedialog.protectCookie "×?×?×? ×¢×? ×?ק×?ק×?">
@@ -132,16 +132,20 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "×?×?ק ×?ת ×?×? ×?ק×?ק×?×? ×?×?×? ×?×?×?× ×?×?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "×?×?×? ×¢×? ק×?ק×?×? ×?×?ש×?×?">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "×?×? ת×?×? ×¢×? ק×?ק×?×? ×?×?ש×?×?">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.disable_livemarks "×?×?×? ×¢×?×?×?× ×? ס×?×?×? ×?×?×?×? ×?×?×?×?×? ש×?×?×?ש ×?Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(×?×?×?×?×¥)">
 <!ENTITY torbutton.prefs.dtd_optional "(×?×?פצ×?×?× ×?×?)">
 <!ENTITY torbutton.prefs.dtd_crucial "(×?×?×?ת×?)">
 <!ENTITY torbutton.prefs.update_torbutton_via_tor "×?×?ר×? ×¢×?×?×?× ×?×? ×?-Torbutton ×?ר×? 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 "×?שת×?ש ×?×?×?פ×? ×?×?×?×?×?×?×? ×?×?× ×?×¢ ×?×?פ×?ש ×?×?×?פ×? ×?×?שר ×?×?צ×? ×¢×? Captcha Google:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!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)">
+<!ENTITY torbutton.prefs.fix_google_srch "פ×?×?פ×?ר×?ת רצ×?×¢×? ×?שפ×? ×?ש×? ש×?×?×?ת×?ת ת×?×?ת ×?×?פ×?ש ש×? ×?×?×?×?">
+<!ENTITY torbutton.prefs.transparentTor "×?פע×?ת ×?×?ר ×?צ×?ר×? ×?×?ת×? נר×?×?ת (×?×?רש  transproxy ×?×? Tor router)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index 3512105..82b986d 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -6,7 +6,7 @@ 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 ×?ספק ×?פת×?ר ×?×?פע×?×? ק×?×? ×?× ×?×?×? ש×? פר×?קס×? ×?×?×?צע×?ת Tor.
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton ×?ס×? פע×?×?×?ת ×?×?×?×? שנ×?×¢×? ×?×?צ×? ×?×?ר ש×? Tor.\n\nפע×?×?×? ×?×? × ×?×¢×?×? ×?עק×?×£ ×?ת ×?×?×?×?×?×? 409737 ×?-417869 ×?פ×?×?רפ×?קס.\n\n×?×? ×?×?×?×¢×? ×?×? נר×?×?ת ×?×?×? ×?×? ס×?×?×?, ×?ת×?×? ש×?×?×? ×?×?תר×?×? ×?נס×? ×?×?×¢×?×? ×?ת עצ×?×? ×?×?×?ש ×?רקע, ×?פע×?×?×? ×?×? × ×?ס×?×?.\n\n×?×?×? ×?×?×¢×?×? ×?×?×?ש ×?תר ×?×¢×?רת Tor, ×?×?×¥ ×¢×? ×?× ×?ר ×?ש×?רת ×?×?ת×?×?ת ש×?×?.\n\n
 torbutton.popup.plugin.warning = Torbutton ×?ס×? ×?×¢×?× ×? ש×? ת×?×?×? ת×?ספ×?×?.\n\n×?× ×? ×?שת×?ש ×?×?פשר×?ת "ש×?×?ר ×?ש×?" ×?×?ק×?×?.\n\n
 torbutton.popup.confirm_ca_certs = ×?ערת Torbutton: נר×?×? ש×?×?×? ×?×? רש×?×?×?ת ×?×?ש×?ר×?×? ×?×?ת×?×?×?×? ×?×?ש×?ת. ×?×?×?נת רש×?×?ת ×?רש×?×?×?ת ×?×?×? פע×?×?×? ×?×?×?×?ת ×?שר ×?×?×?×?×? ×?ת Tor. ×?×?×? ×?ת×? ר×?צ×? ×?×?×?×? ×?ת ×?×?×?×?×?×? ש×? תע×?×?×?ת ×?×?ס×?×?×?ת? (×?×? ×?ת×? ×?×? ×?×?×?× ×?×? ×?ת ×?×?, ×?×? ×?×?×?×? ×?×?×?×?×¥ ×¢×? ×?×?ש×?ר)
@@ -46,7 +46,7 @@ torbutton.popup.short_torbrowser = ×?×?×?×¢ ×?ש×?×? ×¢×? Torbutton!\nTorbutton
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.allow=×?פשר ×?עת×?×?
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=×?×¢×?×?×? ×?×? ×¢×?×?ר ×?תר ×?×?
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 08663f6..4c9328a 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/hi/torbutton.properties b/src/chrome/locale/hi/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/hi/torbutton.properties
+++ b/src/chrome/locale/hi/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 98abd36..d27860b 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/hr/torbutton.properties b/src/chrome/locale/hr/torbutton.properties
index 0e17809..fdec79e 100644
--- a/src/chrome/locale/hr/torbutton.properties
+++ b/src/chrome/locale/hr/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor onemoguÄ?en
 torbutton.panel.label.enabled = Tor omoguÄ?en
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton omoguÄ?ava gumb za lakÅ¡e omoguÄ?avanje ili onemoguÄ?avanje tor proxy-a
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ht/torbutton.dtd
+++ b/src/chrome/locale/ht/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ht/torbutton.properties b/src/chrome/locale/ht/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ht/torbutton.properties
+++ b/src/chrome/locale/ht/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index c88d5e9..6177644 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Szedje ki az operációs rendszert és a nyelvet a Google keresÅ? ablakokból">
 <!ENTITY torbutton.prefs.transparentTor "�tlátszó Tor-osítás (Egyedi transproxy-t vagy Tor routert igényel)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties
index 2307a95..957a4d7 100644
--- a/src/chrome/locale/hu/torbutton.properties
+++ b/src/chrome/locale/hu/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Kattintson rá a bÅ?vítmények engedélyezé
 torbutton.panel.plugins.enabled = Kattintson rá a bÅ?vítmények tiltásához
 torbutton.panel.label.disabled = Tor kikapcsolva
 torbutton.panel.label.enabled = Tor bekapcsolva
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = A Torbutton biztosít egy gombot arra, hogy egyszerűen engedélyezze vagy tiltsa a Firefox Tor proxy-n keresztül irányítását
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blokkolt egy tevékenységet Tor nélküli állapotú fülön.\n\nEz egy kerülÅ? megoldás a Firefox #409737 és #417869 hibáira.\n\nHa ez az elÅ?ugró ablak ok nélkülinek tűnik, akkor valamelyik fülön az egyik oldal megpróbálta magát újratölteni, és ez blokklásra került.\n\nAz oldal újratöltéséhez ebben a Tor állapotban nyomjon 'Enter'-t a a címsorában ennek a fülnek.\n
 torbutton.popup.plugin.warning = A Torbutton blokkolta a közvetlen Tor letöltését egy beépülÅ? modul tartalomnak.\n\nHasználja helyette a Mentés másként opciót.\n
 torbutton.popup.confirm_ca_certs = Torbutton Megjegyzés: �gy tűnik, hogy nincs egyéni hitelesítésszolgáltató listája. A Hitelesítés szolgáltatók listájának vizsgálata lassú esemény, és lelassítja a Tor-t a váltáskor. Szeretné kikapcsolni a Hitelesítésszolgáltatók izolációját? (Ha nem érti ezt, akkor nyugodtan kattintson az OK gombra)
@@ -45,8 +45,8 @@ torbutton.popup.prompt_torbrowser = A Torbutton most már másképp működik: n
 torbutton.popup.short_torbrowser = Fontos Torbutton információ!\n\na Torbutton most már mindig engedélyezett.\n\nKattintson a Torbutton-ra további információkért.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
-canvas.allowAccessKey=A
-canvas.never=Never for This Site
-canvas.neverAccessKey=e
+canvas.siteprompt=Ez a weboldal (%S) megpróbál egy kép adatot elérni egy rétegen. Mivel a réteg kép használható a számítógép felderítésére, üres kép adat lett visszaküldve ez alkalommal.
+canvas.allow=A jövÅ?ben engedélyez
+canvas.allowAccessKey=J
+canvas.never=Soha ennél az oldalnál
+canvas.neverAccessKey=S
diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/hy/torbutton.dtd
+++ b/src/chrome/locale/hy/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/hy/torbutton.properties b/src/chrome/locale/hy/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/hy/torbutton.properties
+++ b/src/chrome/locale/hy/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index 18fe5b5..53c399d 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Lepaskan serambi dan bahasa dari Kotak Pencarian Google">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index 75940d3..e71cee2 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Klik untuk mengaktifkan plugin
 torbutton.panel.plugins.enabled = Klik untuk menonaktifkan plugin
 torbutton.panel.label.disabled = Tor dinonaktifkan
 torbutton.panel.label.enabled = Tor diaktifkan
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton menyediakan tombol untuk mengaktifkan dan menonaktifkan pengarahan jalur Firefox ke proxy Tor
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton memblokir aktivitas dari sebuah tab yang dimuat dalam kondisi Tor yang berbeda.\n\nIni bekerja untuk bug 409737 dan 417869.\n\nApabila popup ini muncul tanpa sebab, salah satu tab Anda mencoba untuk memuat ulang sendiri di latar belakang, dan terblokir.\n\nUntuk memuat ulang tab pada kondisi Tor saat ini, tekan 'enter' pada kotak URL.\n\n
 torbutton.popup.plugin.warning = Torbutton memblokir pemuatan langsung atas konten plugin Tor.\n\nSilahkan Gunakan Save-As saja.\n\n
 torbutton.popup.confirm_ca_certs = Catatan Torbutton: Tampaknya Anda tidak memiliki Certificate Authorities yang disesuaikan. Memeriksa daftar Certificate Authorities merupakan proses yang lambat dan melambatkan peralihan Tor. Apakah Anda berkenan untuk menonaktifkan pengisolasian sertifikat Certificate Authorities? (Apabila Anda tidak paham, adalah aman untuk mengeklik OK)
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 834a96d..f6c146d 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Estrai sistema e idioma dalle interrogazioni di Google Search Box">
 <!ENTITY torbutton.prefs.transparentTor "Torificazione trasparente (richiede un transproxy personalizzato o un tor router)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index a123224..7864bcf 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Fai clic per attivare i plugin
 torbutton.panel.plugins.enabled = Fai clic per disattivare i plugin
 torbutton.panel.label.disabled = Tor disattivato
 torbutton.panel.label.enabled = Tor attivato
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = L'estensione Torbutton fornisce un pulsante per attivare e disattivare il proxy Tor per Firefox
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton ha bloccato le attività in una scheda caricata con un diverso stato Tor.\n\nQuesta operazione evita i Bug 409737 e 417869 di Firefox.\n\nSe questo messaggio popup appare senza motivo, una delle vostre schede è stata bloccata perchè sta tentando di autoricaricarsi in modo silente.\n\nPer ricaricare la scheda in questo stato Tor, premere 'invio' nella barra degli indirizzi.\n\n
 torbutton.popup.plugin.warning = Torbutton ha bloccato l'attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n
 torbutton.popup.confirm_ca_certs = Avviso di Torbutton: sembra che tu non abbia delle Certification Authority personalizzate. L'esame della lista delle Certification Authority è un'operazione lenta e rallenta ancora attivando/disattivando Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK)
@@ -45,8 +45,8 @@ torbutton.popup.prompt_torbrowser = Torbutton ora funziona in modo diverso: non
 torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorbutton ora è sempre abilitato.\n\nClicca su Torbutton per ulteriori informazioni.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Questo sito (%S) ha cercato di accedere ad un'immagine in un elemento canvas. Le immagini canvas possono essere usate per scoprire informazioni sul tuo computer, per questo è stata visualizzata un'immagine vuota.
+canvas.allow=Permetti in futuro
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Mai per questo sito
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 1a146d0..9142f9a 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index c13a160..dec0b69 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -6,7 +6,7 @@ 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ã??ã?­ã?¯ã?·ã??æ??å?¹å??/ç?¡å?¹å??ã?§ã??ã?¾ã??ã??
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbuttonã?¯ã??ã?©ã?°ã?¤ã?³ã??å?©ç?¨ã??ã??ã?³ã?³ã??ã?³ã??ã??ç?´æ?¥èª­ã?¿è¾¼ã?¾ã??ã??ã??ã?¨ã??ã??ã?­ã??ã?¯ã??ã?¾ã??ã??ã??\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)
diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/jv/torbutton.dtd
+++ b/src/chrome/locale/jv/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/jv/torbutton.properties b/src/chrome/locale/jv/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/jv/torbutton.properties
+++ b/src/chrome/locale/jv/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ka/torbutton.properties
+++ b/src/chrome/locale/ka/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/km/torbutton.properties b/src/chrome/locale/km/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/km/torbutton.properties
+++ b/src/chrome/locale/km/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/kn/torbutton.dtd
+++ b/src/chrome/locale/kn/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/kn/torbutton.properties b/src/chrome/locale/kn/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/kn/torbutton.properties
+++ b/src/chrome/locale/kn/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index eedb001..ab106dc 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "구ê¸? ê²?ì?? 쿼리ì?? í??ë?«í?¼ê³¼ ì?¸ì?´ ì ?보를 ë²?겨ë??">
 <!ENTITY torbutton.prefs.transparentTor "í?¬ëª? Toritication (ì?¬ì?©ì?? transproxyë?? Tor ë?¼ì?°í?° í??ì??)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index ab184a3..3970774 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -6,7 +6,7 @@ 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 í??ë¡?ì??를 ì?¬ì?©í??ê±°ë?? ì?¬ì?©í??ì§? ì??ë??ë¡? ì?½ê²? í?´ 주ë?? ë²?í?¼ì??ë??ë?¤.
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbuttonì?? ë?¤ë¥¸ Tor ì??í??ì??ì?? ì?´ë¦° í?­ì?? í??ë??ì?? ë§?ì??ì?µë??ë?¤.\n\nì?´ê²?ì?? Firefox ë²?ê·¸ 409737ê³¼ 417869 ë??문ì?? ì?¼ì?´ë?¬ì?µë??ë?¤.\n\në§?ì?½ ì?´ í??ì??ì?´ ì?´ì?  ì??ì?´ ì?¼ì?´ë?? ê²?ì²?ë?¼ ë³´ì?¸ë?¤ë©´, ê·?í??ì?? í?­ ì¤? í??ë??ê°? 백그ë?¼ì?´ë??ì??ì?? ë?¤ì?? ì?´ë¦¬ë ¤ê³  í??ë?? ê²?ì?´ê³ , ì?´ê²?ì?´ ë§?í??ì?µë??ë?¤.\n\nê·¸ í?­ì?? ì?´ Tor ì??í??ì??ì?? ì?´ê¸° ì??í??ì?¬, URL ì??ì??ì?? Enter í?¤ë¥¼ ë??르ì?­ì??ì?¤.\n
 torbutton.popup.plugin.warning = Torbuttonì?? í??ë?¬ê·¸ì?¸ ì½?í??츠ì?? ì§?ì ? Tor ë¡?ë??를 ë§?ì??ì?µë??ë?¤.\n\në?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥ì?? ë??ì?  ì?¬ì?©í??ì?­ì??ì?¤.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: ì?¬ì?©ì?? ì ?ì?? ì?¸ì¦? 기ê´?ì?´ ì??ë?? ê²?ì?¼ë¡? ë³´ì??ë??ë?¤. ì?¸ì¦? 기ê´? 목ë¡? ê²?ì?¬ë?? ë??리고, Tor toggle ì??ë??ê°? ë??ë ¤ì§?ë??ë?¤. ì?¸ì¦? 기ê´? ì?¸ì¦?ì??ì?? 격리를 í?´ì ?í??ì??ê² ì?µë??ê¹?? (ë§?ì?½ ì?´í?´ê°? ì?? ë??ì? ë?¤ë©´, OK를 ë??ë?¬ë?? ì??ì ?í?©ë??ë?¤.)
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ku/torbutton.properties b/src/chrome/locale/ku/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ku/torbutton.properties
+++ b/src/chrome/locale/ku/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/kw/torbutton.dtd
+++ b/src/chrome/locale/kw/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/kw/torbutton.properties b/src/chrome/locale/kw/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/kw/torbutton.properties
+++ b/src/chrome/locale/kw/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ky/torbutton.dtd
+++ b/src/chrome/locale/ky/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ky/torbutton.properties b/src/chrome/locale/ky/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ky/torbutton.properties
+++ b/src/chrome/locale/ky/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/lb/torbutton.dtd
+++ b/src/chrome/locale/lb/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/lb/torbutton.properties b/src/chrome/locale/lb/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/lb/torbutton.properties
+++ b/src/chrome/locale/lb/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ln/torbutton.dtd
+++ b/src/chrome/locale/ln/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ln/torbutton.properties b/src/chrome/locale/ln/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ln/torbutton.properties
+++ b/src/chrome/locale/ln/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/lo/torbutton.dtd
+++ b/src/chrome/locale/lo/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/lo/torbutton.properties b/src/chrome/locale/lo/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/lo/torbutton.properties
+++ b/src/chrome/locale/lo/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/lt/torbutton.dtd
+++ b/src/chrome/locale/lt/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/lt/torbutton.properties b/src/chrome/locale/lt/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/lt/torbutton.properties
+++ b/src/chrome/locale/lt/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd
index 01fa8f1..7694f52 100644
--- a/src/chrome/locale/lv/torbutton.dtd
+++ b/src/chrome/locale/lv/torbutton.dtd
@@ -1,147 +1,151 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.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 "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!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">
+<!ENTITY torbutton.prefs.title "Torbutton preferences">
+<!ENTITY torbutton.prefs.display_settings "RÄ?dÄ«t iestatÄ«jumus">
+<!ENTITY torbutton.prefs.display_panel "RÄ?dÄ«t Tor'a starpnieka iestatÄ«jumus statusa joslÄ?">
+<!ENTITY torbutton.prefs.panel_format "Statusa joslas rÄ?dÄ«Å¡anas formÄ?ts:">
+<!ENTITY torbutton.prefs.panel_text_format "Teksts">
+<!ENTITY torbutton.prefs.panel_icon_format "Piktogramma">
+<!ENTITY torbutton.prefs.tor_settings "Starpnieka iestatījumi">
+<!ENTITY torbutton.prefs.recommended_settings "Lietot manai Firefox'a versijai ieteiktos starpnieka iestatījumus">
+<!ENTITY torbutton.prefs.use_privoxy "Lietot Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Lietot Polipo">
+<!ENTITY torbutton.prefs.custom_settings "Lietot starpnieka pielÄ?gotus iestatÄ«jumus">
+<!ENTITY torbutton.prefs.proxy.host.http "HTTP starpnieks:">
+<!ENTITY torbutton.prefs.proxy.host.https "SSL starpnieks:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "FTP starpnieks:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher starpnieks:">
+<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS'a viesotÄ?js:">
+<!ENTITY torbutton.prefs.proxy.port "Ports:">
+<!ENTITY torbutton.about.title "Par Torbutton">
+<!ENTITY torbutton.about.version "Versija:">
+<!ENTITY torbutton.about.summary "AizsargÄ? JÅ«su Tor pÄ?rlÅ«koÅ¡anas privÄ?tumu.">
+<!ENTITY torbutton.about.code "Koda izstrÄ?des lÄ«dzdalÄ«bnieki:">
+<!ENTITY torbutton.about.maintainer "TurÄ?tÄ?js:">
+<!ENTITY torbutton.about.security_review "DroÅ¡Ä«bas pÄ?rskats:">
+<!ENTITY torbutton.about.donate "Ja Jums patÄ«k lietot Tor, variet apsvÄ?rt">
+<!ENTITY torbutton.about.make_donation "ziedojuma veikšanu.">
+<!ENTITY torbutton.pref_connection.notice "AtspÄ?jot Torbutton, lai mainÄ«tu Å¡os iestatÄ«jumus.">
+<!ENTITY torbutton.pref_connection.more_info "Papildu informÄ?cija">
+<!ENTITY torbutton.pref_connection_more_info.title "Palīdzība">
+<!ENTITY torbutton.pref_connection_more_info.text "Å obrÄ«d Torbutton ir iespÄ?jots.  Ja vÄ?laties mainÄ«t savus Ä?rpus-Tor starpnieka iestatÄ«jumus, lÅ«dzu atspÄ?jojiet Torbutton un tad atgriezieties te.  Ja vÄ?laties mainÄ«t savus Tor iestatÄ«jumus, lÅ«dzu lietojiet Torbutton'a preferenÄ?u logu.">
+<!ENTITY torbutton.context_menu.new_identity "Jauna identitÄ?te">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.context_menu.toggle "PÄ?rslÄ?gt Tor statusu">
 <!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 "Par Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "AizsardzÄ«ba no sÄ«kdatnÄ?m">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor "KopÄ?t 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 "AtvÄ?rt jaunÄ? cilnÄ? Tor'a URL">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "AtvÄ?rt jaunÄ? logÄ? Tor'a URL">
 <!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.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.button.tooltip "NoklikÅ¡Ä·inÄ?t, lai inicializÄ?tu Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Drošības iestatījumi">
+<!ENTITY torbutton.prefs.block_thread "BloÄ·Ä?t vÄ?stures nolasi Tor'a darbÄ«bas laikÄ? (ļoti svarÄ«gi)">
+<!ENTITY torbutton.prefs.block_thwrite "BloÄ·Ä?t vÄ?stures rakstÄ«Å¡anu Tor'a darbÄ«bas laikÄ? (ieteicami)">
+<!ENTITY torbutton.prefs.block_nthread "BloÄ·Ä?t vÄ?stures nolasi Ä?rpus-Tor'a darbÄ«bas laikÄ? (neobligÄ?ti)">
+<!ENTITY torbutton.prefs.block_nthwrite "BloÄ·Ä?t vÄ?stures rakstÄ«Å¡anu Ä?rpus-Tor'a darbÄ«bas laikÄ? (neobligÄ?ti)">
+<!ENTITY torbutton.prefs.clear_history "NodzÄ?st vÄ?sturi, pÄ?rslÄ?dzot Tor'u (neobligÄ?ti)">
+<!ENTITY torbutton.prefs.clear_cache "BloÄ·Ä?t Tor diska keÅ¡atmiÅ?u un iztÄ«rÄ«t visas keÅ¡atmiÅ?as, pÄ?rslÄ?dzot Tor'u">
+<!ENTITY torbutton.prefs.block_cache "BloÄ·Ä?t atmiÅ?as un diska keÅ¡atmiÅ?as, Tor'a darbÄ«bas laikÄ?">
+<!ENTITY torbutton.prefs.cookie_jars "GlabÄ?t Ä?rpus-Tor'a sÄ«kdatnes aizsargÄ?tÄ? traukÄ?">
+<!ENTITY torbutton.prefs.cookie_protection "Lai izvÄ?lÄ?tos, lietot AizsardzÄ«bas no sÄ«kdatnÄ?m dialogu">
+<!ENTITY torbutton.prefs.mmm_cookies "Pats pÄ?rraudzÄ«Å¡u sÄ«kdatnes (bÄ«stami)">
+<!ENTITY torbutton.prefs.clear_cookies "NodzÄ?ts sÄ«kdatnes, pÄ?rslÄ?dzot Tor'u">
+<!ENTITY torbutton.prefs.disable_plugins "Tor'a lietoÅ¡anas laikÄ? atspÄ?jot spraudÅ?us (ļoti svarÄ«gi)">
+<!ENTITY torbutton.prefs.kill_bad_js "Ķert bīstamus javascript'us (ļoti svarīgi)">
+<!ENTITY torbutton.prefs.isolate_content "IzolÄ?t dinamisku saturu paÅ¡reizÄ?jÄ? Tor stÄ?vokļa ietvaros (ļoti svarÄ«gi)">
+<!ENTITY torbutton.prefs.no_updates "Tor'a lietoÅ¡anas laikÄ? atspÄ?jot atjauninÄ?jumus">
+<!ENTITY torbutton.prefs.set_uagent "IestatÄ«t lietotÄ?ja aÄ£entu Tor lietoÅ¡anai (ļoti svarÄ«gi)">
+<!ENTITY torbutton.prefs.dynamic "Dinamisks saturs">
+<!ENTITY torbutton.prefs.cookies "SÄ«kdatnes">
+<!ENTITY torbutton.prefs.cache "KeÅ¡atmiÅ?a">
+<!ENTITY torbutton.prefs.history "VÄ?sture">
+<!ENTITY torbutton.prefs.no_search "Tor'a lietoÅ¡anas laikÄ? atspÄ?jot meklÄ?Å¡anas ieteikumus (ieteicami)">
+<!ENTITY torbutton.prefs.shutdown "IzslÄ?gÅ¡ana">
+<!ENTITY torbutton.prefs.tor_shutdown "Tor-iespÄ?jota pÄ?rlÅ«ka izslÄ?gÅ¡anas laikÄ? izdzÄ?st Tor'a sÄ«kdatnes">
+<!ENTITY torbutton.prefs.all_shutdown "IzdzÄ?st sÄ«kdatnes jebkura pÄ?rlÅ«ka izslÄ?gÅ¡anÄ?s laikÄ?">
+<!ENTITY torbutton.prefs.no_shutdown "IzslÄ?gÅ¡anÄ?s laikÄ? neizdzÄ?st manas sÄ«kdatnes">
+<!ENTITY torbutton.prefs.disable_sessionstore "AtspÄ?jot sesijas saglabÄ?Å¡anu (ieteicami)">
+<!ENTITY torbutton.prefs.headers "Galvenes">
+<!ENTITY torbutton.prefs.spoof_english "MaldinÄ?t, uzdodoties par pÄ?rlÅ«ku, kurÅ¡ strÄ?dÄ? amerikÄ?Å?u angļu valodÄ?">
+<!ENTITY torbutton.prefs.refererspoofing "MaldinÄ?Å¡ana, norÄ?dot aplamas atsauces">
 <!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 "Vieda maldinÄ?Å¡ana, Tor'a lietoÅ¡anas laikÄ? norÄ?dot aplamas atsauces (maldina, norÄ?dot Å¡Ä·Ä?rsdomÄ?nu atsauces)">
 <!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 "Tor'a lietoÅ¡anas laikÄ? atspÄ?jot dokumentu objektu moduļa jeb DOM glabÄ?Å¡anu (ļoti svarÄ«gi)">
+<!ENTITY torbutton.prefs.forms "Veidlapas">
+<!ENTITY torbutton.prefs.block_tforms "Tor'a darbÄ«bas laikÄ? bloÄ·Ä?t parole+veidlapa saglabÄ?Å¡anu (ieteicami)">
+<!ENTITY torbutton.prefs.block_ntforms "Ä?rpus-Tor'a darbÄ«bas laikÄ? bloÄ·Ä?t parole+veidlapa saglabÄ?Å¡anu (neobligÄ?ti)">
 <!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 "Ä?rpus-Tor">
+<!ENTITY torbutton.prefs.restore_tor "StartÄ?jot atjaunotu sesiju, iestatÄ«t Tor stÄ?vokli:">
+<!ENTITY torbutton.prefs.startup_tor "StartÄ?jot pÄ?rlÅ«ku, iestatÄ«t Tor stÄ?vokli uz:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox'a avÄ?rijas gadÄ«jumÄ? pÄ?rlÄ?dÄ?t sÄ«kdatÅ?u trauku / nodzÄ?st sÄ«kdatnes (ieteicami)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "GlabÄ?t gan Tor, gan Ä?rpus-Tor sÄ«kdatnes aizsargÄ?tos traukos (bÄ«stami)">
+<!ENTITY torbutton.prefs.clear_http_auth "IzdzÄ?st HTTP autentifikÄ?cijas sesijas (ieteicami)">
+<!ENTITY torbutton.prefs.block_js_history "IzolÄ?t piekļuvi vÄ?stures navigÄ?cijai tikai Tor stÄ?vokļa ietvaros (ļoti svarÄ«gi)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Tor'a izmantoÅ¡anas laikÄ? mainÄ«t logu izmÄ?rus 50 px soļos (ieteicami)">
+<!ENTITY torbutton.prefs.close_tor "PÄ?rslÄ?dzot aizvÄ?rt visus Tor logus un cilnes (neobligÄ?ti)">
+<!ENTITY torbutton.prefs.close_nontor "PÄ?rslÄ?dzot aizvÄ?rt visus Ä?rpus-Tor logus un cilnes (neobligÄ?ti)">
+<!ENTITY torbutton.prefs.block_links "BloÄ·Ä?t saiÅ¡u klikÅ¡Ä·us un lapu pÄ?rlÄ?des no citiem Tor stÄ?vokļiem (neobligÄ?ti)">
+<!ENTITY torbutton.prefs.jar_certs "GlabÄ?t SSL sertifikÄ?tus atseviÅ¡Ä·os traukos Tor'am/Ä?rpus-Tor'am (ieteicami)">
+<!ENTITY torbutton.prefs.jar_ca_certs "GlabÄ?t sertificÄ?Å¡anas iestÄ?des, SI jeb angļu val. CA sertifikÄ?tus atseviÅ¡Ä·os traukos Tor'am/Ä?rpus-Tor'am (ieteicami)">
+<!ENTITY torbutton.prefs.locked_mode "Karstie taustiÅ?i un Poga AtspÄ?jot, lai novÄ?rstu nejauÅ¡u pÄ?rslÄ?gÅ¡anos">
+<!ENTITY torbutton.prefs.startup_state "StartÄ?jot ierasti, iestatÄ«t Tor stÄ?vokli:">
+<!ENTITY torbutton.prefs.shutdown_state "IzslÄ?gÅ¡anas stÄ?voklis">
+<!ENTITY torbutton.prefs.startup "StartÄ?Å¡ana">
+<!ENTITY torbutton.prefs.block_tor_file_net "BloÄ·Ä?t Tor piekļuvi tÄ«klam no file:// urls (ieteicami)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "BloÄ·Ä?t Ä?rpus-Tor piekļuvi tÄ«klam no file:// urls">
+<!ENTITY torbutton.prefs.restore_defaults "Atjaunot noklusÄ?juma vÄ?rtÄ«bas">
+<!ENTITY torbutton.prefs.test_settings "PÄ?rbaudÄ«t iestatÄ«jumus">
+<!ENTITY torbutton.prefs.test_auto "KatrÄ? Firefox startÄ?Å¡anas laikÄ? pÄ?rbaudÄ«t manus Tor iestatÄ«jumus pÄ?c tam kad pirmo reizi pÄ?rslÄ?dzos">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "NerakstÄ«t Tor sÄ«kdatnes diskÄ?">
+<!ENTITY torbutton.prefs.nontor_memory_jar "NerakstÄ«t Ä?rpus-Tor sÄ«kdatnes diskÄ?">
+<!ENTITY torbutton.prefs.session_restore "Sesijas glabÄ?tuvÄ? saglabÄ?t un no tÄ?s atjaunot Å¡Ä«s cilnes:">
+<!ENTITY torbutton.prefs.nontor_tabs "Cilnes, kuras ielÄ?dÄ?tas Ä?rpus-Tor'Ä?">
+<!ENTITY torbutton.prefs.tor_tabs "Cilnes, kuras ielÄ?dÄ?tas Tor'Ä?">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.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 "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.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.no_proxies_on "Nav starpnieku priekš: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "BrÄ«dinÄ?jums: Izvairieties lietot ikvienu no augstÄ?k norÄ?dÄ«tajiem viesotÄ?jnosaukumiem">
+<!ENTITY torbutton.prefs.spoofreresh "MaldinÄ?Å¡anas atjaunoÅ¡ana">
+<!ENTITY torbutton.prefs.refereroptions "AtsauÄ?u maldinÄ?Å¡anas iespÄ?jas">
+<!ENTITY torbutton.prefs.nospoof "NemaldinÄ?t ar atsaucÄ?m">
+<!ENTITY torbutton.prefs.spoofroot "MaldinÄ?t ar lapas saturoÅ¡o mapi">
+<!ENTITY torbutton.prefs.spoofdomain "MaldinÄ?t ar domÄ?na norÄ?di">
+<!ENTITY torbutton.prefs.spoofblank "Padarīt atsauces tukšas">
+<!ENTITY torbutton.cookiedialog.title "PÄ?rvaldÄ«t aizsardzÄ«bu no sÄ«kdatnÄ?m">
+<!ENTITY torbutton.cookiedialog.lockCol "AizsargÄ?ts">
+<!ENTITY torbutton.cookiedialog.domainCol "ViesotÄ?js">
+<!ENTITY torbutton.cookiedialog.nameCol "Nosaukums">
+<!ENTITY torbutton.cookiedialog.pathCol "Ceļš">
+<!ENTITY torbutton.cookiedialog.protectCookie "AizsargÄ?t sÄ«kdatni">
+<!ENTITY torbutton.cookiedialog.removeCookie "NoÅ?emt sÄ«kdatni">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "NoÅ?emt sÄ«kdatnes aizsardzÄ«bu">
+<!ENTITY torbutton.cookiedialog.removeAllBut "NoÅ?emt visas, izÅ?emot aizsargÄ?tÄ?s">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "AizsargÄ?t jaunÄ?s sÄ«kdatnes">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NeaizsargÄ?t jaunÄ?s sÄ«kdatnes">
+<!ENTITY torbutton.prefs.disable_livemarks "Tor's lietoÅ¡anas laikÄ? atspÄ?jot Livemark jeb dzÄ«vatzÄ«mju atjaunoÅ¡anu">
+<!ENTITY torbutton.prefs.dtd_recommended "(ieteicami)">
+<!ENTITY torbutton.prefs.dtd_optional "(neobligÄ?ti)">
+<!ENTITY torbutton.prefs.dtd_crucial "(ļoti svarīgi)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Novirzīt Torbutton atjaunotnes caur Tor'u">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Sastopoties ar Google Captcha, automÄ?tiski lietot citu meklÄ?tÄ?jprogrammu:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!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)">
+<!ENTITY torbutton.prefs.fix_google_srch "NoÅ?emt platformu un valodu no gÅ«gļa meklÄ?Å¡anas lodziÅ?u jeb Google Search Box vaicÄ?jumiem">
+<!ENTITY torbutton.prefs.transparentTor "PÄ?rredzama torifikÄ?cija (nepiecieÅ¡ams pielÄ?gots pÄ?rstarpnieks jeb transproxy vai Tor'a marÅ¡rutÄ?tÄ?js)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/lv/torbutton.properties b/src/chrome/locale/lv/torbutton.properties
index 4a44026..e44d97a 100644
--- a/src/chrome/locale/lv/torbutton.properties
+++ b/src/chrome/locale/lv/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = NoklikÅ¡Ä·inÄ?t, lai iespÄ?jotu spraudÅ?us
 torbutton.panel.plugins.enabled = NoklikÅ¡Ä·inÄ?t, lai atspÄ?jotu spraudÅ?us
 torbutton.panel.label.disabled = Tor ir atspÄ?jots
 torbutton.panel.label.enabled = Tor ir iespÄ?jots
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton piedÄ?vÄ? pogu, lai viegli iespÄ?jotu vai atspÄ?jotu Firefox rÄ?dÄ«Å¡anu uz Tor starpnieka
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton bloÄ·Ä?ja cilnes aktivitÄ?ti, kura ielÄ?dÄ?ta citÄ? Tor stÄ?voklÄ«.â?? â?? Tas nepiecieÅ¡ams, lai novÄ?rstu Firefox kļūdas nr. 409737 un 417869.â?? â?? Ja Å¡is uznirstoÅ¡ais elements parÄ?dÄ«jÄ?s bez Å¡Ä·ietama iemesla, tad kÄ?da no jÅ«su cilnÄ?m cenÅ¡as sevi fonÄ? pÄ?rlÄ?dÄ?t, taÄ?u Å¡is mÄ?Ä£inÄ?jums tika bloÄ·Ä?ts.â?? â??Lai pÄ?rlÄ?dÄ?tu cilni Å¡ajÄ? Tor stÄ?voklÄ«, lodziÅ?Ä? URL atraÅ¡anÄ?s vieta nospiediet taustiÅ?u "IevadÄ«t".â?? â??\n
 torbutton.popup.plugin.warning = Torbutton bloÄ·Ä?ja tieÅ¡u Tor spraudÅ?a satura ielÄ?di. â?? â?? TÄ?dÄ? gadÄ«jumÄ? lietojiet SaglabÄ?t kÄ?. â?? â??\n
 torbutton.popup.confirm_ca_certs = Torbutton piezÄ«me: Å Ä·iet, ka jums nav pielÄ?gotu SertificÄ?Å¡anas iestÄ?žu. SertificÄ?Å¡anas iestÄ?žu pÄ?rbaude ir laikietilpÄ«ga darbÄ«ba un palÄ?nina Tor pÄ?rslÄ?gÅ¡anos. Vai vÄ?laties atspÄ?jot sertificÄ?Å¡anas iestÄ?žu sertifikÄ?tu izolÄ?Å¡anu? (Ja nesaprotat, kas tieÅ¡i te ir domÄ?ts, tad, ziniet, ka ir droÅ¡i noklikÅ¡Ä·inÄ?t Labi jeb OK)
@@ -41,12 +41,12 @@ torbutton.popup.pref_error = Torbutton nespÄ?j atjauninÄ?t preferences PÄ?rlÅ«ka
 torbutton.popup.permission_denied = LÅ«dzu vai nu atiestatiet pÄ?rlÅ«ka Tor direktorijas atļaujas, vai arÄ« kopÄ?jiet to uz jaunu vietu.
 torbutton.popup.device_full = Å Ä·iet, ka cietais disks ir pilns. LÅ«dzu, atbrÄ«vojiet vietu uz diska vai pÄ?rvietojiet pÄ?rlÅ«ku Tor uz citu ierÄ«ci.
 torbutton.title.prompt_torbrowser = SvarÄ«ga Torbutton informÄ?cija
-torbutton.popup.prompt_torbrowser = Torbutton tagad strÄ?dÄ? citÄ?dÄ?k: to vairs nevarat izslÄ?gt.\n\nMÄ?s izdarÄ«jÄ?m Å¡o izmaiÅ?u jo nav droÅ¡i izmantot Torbutton pÄ?rlÅ«kÄ?, kurÅ¡ tiek arÄ« izmantots pÄ?rlÅ«koÅ¡anai, kas neizmanto Tor. VienkÄ?rÅ¡i bija pÄ?rÄ?k daudz kļūdu, kuras mÄ?s savÄ?dÄ?k nevarÄ?jÄ?m labot.\n\nJa vÄ?laties turpinÄ?t izmantot Firefox kÄ? ierasts, atinstalÄ?jiet Torbutton un lejupielÄ?dÄ?jiet Tor Browser Bundle. Tor Browser privÄ?tuma rekvizÄ«ti ir svarÄ«gÄ?ki nekÄ? Firefox rekvizÄ«ti, pat tad ja Firefox tiek izmantots ar Torbutton.\n\nLai nonÄ?mtu Torbutton, izvÄ?lieties Tools->Addons->Extensions un klikÅ¡Ä·iniet uz Remove pogu, kura atrodas blakus Torbutton.
+torbutton.popup.prompt_torbrowser = Torbutton tagad strÄ?dÄ? citÄ?dÄ?k: to vairs nevarat izslÄ?gt.\n\nMÄ?s izdarÄ«jÄ?m Å¡o izmaiÅ?u jo nav droÅ¡i izmantot Torbutton pÄ?rlÅ«kÄ?, kurÅ¡ tiek arÄ« izmantots pÄ?rlÅ«koÅ¡anai, kas neizmanto Tor. VienkÄ?rÅ¡i bija pÄ?rÄ?k daudz kļūdu, kuras mÄ?s savÄ?dÄ?k nevarÄ?jÄ?m labot.\n\nJa vÄ?laties turpinÄ?t izmantot Firefox kÄ? ierasts, atinstalÄ?jiet Torbutton un lejupielÄ?dÄ?jiet Tor Browser Bundle. Tor Browser privÄ?tuma rekvizÄ«ti ir svarÄ«gÄ?ki nekÄ? Firefox rekvizÄ«ti, pat tad ja Firefox tiek izmantots ar Torbutton.\n\nLai nonÄ?mtu Torbutton, izvÄ?lieties RÄ«ko->Pievienojumi->PaplaÅ¡inÄ?jumi jeb Tools->Addons->Extensions un noklikÅ¡Ä·iniet uz pogu NoÅ?emt jeb Remove pogu, kura atrodas blakus Torbutton.
 torbutton.popup.short_torbrowser = SvarÄ«ga Torbutton informÄ?cija!\n\nTorbutton tagad ir iespÄ?jots vienmÄ?r.\n\nNoklikÅ¡Ä·iniet uz Torbutton, lai saÅ?emtu papildu informÄ?ciju.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=TÄ«mekļa lapa (%S) mÄ?Ä£inÄ?ja piekļūt attÄ?la datiem no datora fona jeb audekla. TÄ? ka attÄ?la datus iespÄ?jams lietot lai noteiktu informÄ?ciju par datoru, Å¡oreiz tika nosÅ«tÄ«ti tukÅ¡a attÄ?la dati.
+canvas.allow=TurpmÄ?k atļaut
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Å ai vietnei nekad
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/mg/torbutton.dtd
+++ b/src/chrome/locale/mg/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mg/torbutton.properties b/src/chrome/locale/mg/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/mg/torbutton.properties
+++ b/src/chrome/locale/mg/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/mi/torbutton.dtd
+++ b/src/chrome/locale/mi/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mi/torbutton.properties b/src/chrome/locale/mi/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/mi/torbutton.properties
+++ b/src/chrome/locale/mi/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/mk/torbutton.dtd
+++ b/src/chrome/locale/mk/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mk/torbutton.properties b/src/chrome/locale/mk/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/mk/torbutton.properties
+++ b/src/chrome/locale/mk/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ml/torbutton.dtd
+++ b/src/chrome/locale/ml/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ml/torbutton.properties b/src/chrome/locale/ml/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ml/torbutton.properties
+++ b/src/chrome/locale/ml/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/mn/torbutton.dtd
+++ b/src/chrome/locale/mn/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mn/torbutton.properties b/src/chrome/locale/mn/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/mn/torbutton.properties
+++ b/src/chrome/locale/mn/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/mr/torbutton.dtd
+++ b/src/chrome/locale/mr/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mr/torbutton.properties b/src/chrome/locale/mr/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/mr/torbutton.properties
+++ b/src/chrome/locale/mr/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ms/torbutton.dtd
+++ b/src/chrome/locale/ms/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ms/torbutton.properties b/src/chrome/locale/ms/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ms/torbutton.properties
+++ b/src/chrome/locale/ms/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/mt/torbutton.properties b/src/chrome/locale/mt/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/mt/torbutton.properties
+++ b/src/chrome/locale/mt/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd
index 43a7761..fcdff9a 100644
--- a/src/chrome/locale/my/torbutton.dtd
+++ b/src/chrome/locale/my/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "á??á?°á??á?² á??á?¾á?¬á??á?½á?±á??á?±á?¸ á?¡á??á?½á??á?ºá??á?¾á?­ á??á?±á?¸á??á?½á??á?ºá?¸á??á?»á?¬á?¸á??á?¾ á??á??á??á?ºá??á?±á?¬á??á?ºá?¸á??á?¾á??á?ºá?· á??á?¬á??á?¬á??á??á?¬á?¸ á??á?­á?¯á?·á??á?­á?¯ á??á??á?ºá??á?¯á??á?ºá??á??á?º">
 <!ENTITY torbutton.prefs.transparentTor "á??á?½á??á?ºá?·á??á??á?ºá?¸á??á?¼á??á?ºá??á?¬á??á?±á?¬ Tor á??á?¯á?¶á?¸á??á?½á?²á??á?¾á?¯ (á??á?­á??á?ºá??á?¼á?­á?¯á??á?º transproxy á??á?¾á??á?ºá?· Tor Router á??á?­á?¯á?¡á??á?ºá??á??á?º)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/my/torbutton.properties b/src/chrome/locale/my/torbutton.properties
index a577f71..1c70ecd 100644
--- a/src/chrome/locale/my/torbutton.properties
+++ b/src/chrome/locale/my/torbutton.properties
@@ -6,7 +6,7 @@ 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 á??á??á?º á??á?®á?¸á??á?»á?¾á?¶á??á?¼á?±á??á?½á?±á?¸á??á?­á?¯ Tor á??á??á?±á?¬á??á?ºá??á?®á??á?¶ á??á?½á?¾á??á?ºá??á?¼á??á?¾á?¯á??á?­á?¯ á?¡á??á?½á??á?ºá??á??á?° á??á?½á??á?ºá?·á??á?­á?¯á??á?º (á??á?­á?¯á?·) á??á?­á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá?· á??á??á?¯á??á?ºá??á??á?ºá??á?¯á??á?­á?¯ á??á?¶á?·á??á?­á?¯á?¸á??á?±á?¸á??á??á?º
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton á??á??á?º á?¡á??á?¼á?¬á?¸ Tor á?¡á??á?¼á?±á?¡á??á?± á??á??á?ºá??á?¯á??á?½á??á?º á??á?½á??á?ºá?·á??á?¬á?¸á??á??á?ºá?· á??á?¬á?¡á??á?¾á??á?º á??á??á?ºá??á?¯á??á?¾ á??á?¾á?¯á??á?ºá??á?¾á?¬á?¸á??á?¾á?¯á??á?­á?¯ á??á?­á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??\n\ná??á??á?ºá?¸á??á?­á?¯ á??á?®á?¸á??á?»á?¾á?¶á??á?¼á?±á??á?½á?±á?¸ á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?»á?¬á?¸ á??á??á??á??á??á?? á??á?¾á??á?ºá?· á??á??á??á??á??á?? á??á??á?ºá?¸á??á?»á??á?ºá?? á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á??á?º á??á?¼á??á?ºá??á??á?ºá??\n\ná?¡á??á??á?ºá?? á?¤á??á?½á??á?ºá?·á??á?½á??á?º á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á??á?º á?¡á??á?¼á?±á?¬á??á?ºá?¸á??á??á?¾á?­á??á?² á??á?±á?«á?ºá??á?¬á??á?«á??á?? á??á??á?ºá?· á??á?¬á?¡á??á?¾á??á?º á??á??á?ºá??á?¯á??á??á?º á??á?±á?¬á??á?ºá??á?½á??á?ºá??á?¾ á??á?°á?·á??á?¬á??á?¬ á??á?½á??á?ºá?·á??á??á?º á??á?¼á?­á?¯á?¸á??á??á?ºá?¸á??á?±á??á?¼á?®á?¸á?? á??á??á?ºá?¸á??á?­á?¯ á??á?­á??á?ºá??á?¬á?¸á??á??á?ºá??\n\ná?¤ Tor á?¡á??á?¼á?±á
 ?¡á??á?±á??á?½á??á?º á??á?¬á?¡á??á?¾á??á?ºá?ºá??á?­á?¯ á??á?¼á??á?ºá??á?½á??á?ºá?·á??á?«á??á?? URL á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?ºá??á?±á??á?¬ á?¡á??á?½á??á?ºá??á?²á??á?½á??á?º 'á??á??á?ºá?·á??á?½á??á?ºá?¸á??á??á?º' á??á??á?¯á??á?ºá??á?­á?¯ á??á?¾á?­á??á?ºá??á?«á??\n\n
 torbutton.popup.plugin.warning = Torbutton á??á??á?º á??á??á??á?ºá?¡á??á?º á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á??á?²á?? á??á?­á?¯á??á?ºá??á?­á?¯á??á?º Tor á??á?½á??á?ºá?·á??á?¼á??á?»á??á?ºá??á?­á?¯ á??á?­á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??\n\ná??á??á?ºá?¸á?¡á??á?¬á?¸ Save-As á??á?­á?¯ á??á?¯á?¶á?¸á??á?«á??\n\n
 torbutton.popup.confirm_ca_certs = Torbutton á??á?¾á??á?ºá??á?»á??á?º - á??á??á?ºá?·á??á?¶á?? á??á?­á??á?ºá??á?¼á?­á?¯á??á?º á?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯ á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?½á??á?ºá?·á??á?»á?¬á?¸ á??á?¾á?­á??á?¯á?¶á??á??á?±á?«á?ºá??á?«á?? á?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯ á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?½á??á?ºá?· á??á?¬á??á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?¼á??á?ºá?¸á??á??á?º á?¡á??á?½á??á?º á??á?¾á?±á?¸á??á?½á?±á?¸á??á??á?ºá?· á??á?¯á??á?ºá??á??á?ºá?¸á??á?¼á??á?ºá??á?¼á?®á?¸Tor á?¡á??á?­á??á?ºá?¸á??á??á?¯á??á?ºá??á?­á?¯ á??á?¾á?±á?¸á??á?½á?±á?¸á??á?±á??á??á?ºá?? á?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯ á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?½á??á?ºá?· á??á??á?ºá??á?¾á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?®á?¸á??á??á?ºá?·á??á?¬á?¸á??á?¾á?­á??á?¾á?¯á??á?­á?¯ á??á??á?º á??á?­á??á?ºá??á?­á?¯á??á??á?¬á?¸á?? (á?¡á??á??á?ºá?? á?¤á?¡á??á?»á??á?ºá??á?­á?¯ á??á??á?º á??á?¬á?¸á??á??á??á?ºá??á?«á??á?? á??á?±á?¬á??á?ºá?¸á??á?¼á?® á??á??á?¯á??á?ºá??á?­á?¯ á??á?­á??á?ºá??á?»á??á??á?
 ºá??á?» á??á?¾á?­á??á?ºá??á?­á?¯á??á?ºá??á??á?º)
diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/nah/torbutton.dtd
+++ b/src/chrome/locale/nah/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nah/torbutton.properties b/src/chrome/locale/nah/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/nah/torbutton.properties
+++ b/src/chrome/locale/nah/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/nap/torbutton.dtd
+++ b/src/chrome/locale/nap/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nap/torbutton.properties b/src/chrome/locale/nap/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/nap/torbutton.properties
+++ b/src/chrome/locale/nap/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index c05d5dc..76fa379 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Fjern platform og språk fra Google Search Box søk.">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index c8b32f2..d6e0c75 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Klikk for å aktivere plugins
 torbutton.panel.plugins.enabled = Klikk for å deaktivere plugins
 torbutton.panel.label.disabled = Tor er deaktivert
 torbutton.panel.label.enabled = Tor er aktivert
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton legger til en knapp som gjør det enkelt å aktivere eller deaktivere Firefox sin tilgang til Tor-proxyen
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blokkerte direkte Tor-lasting av plugin-innhold.\n\nBruk lagre-som istedenfor.\n
 torbutton.popup.confirm_ca_certs = Torbutton notis: Det virker som om du ikke har noen egne Certificate Authorities. � undersøke Certificate Authority-listen er en treg operasjon og kommer til å gjøre bytte til Tor saktere. Vil du bare deaktivere isolasjonen av Certificate Authority serfikater? (Hvis du ikke forstår dette er det trygt å trykke på OK)
diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ne/torbutton.dtd
+++ b/src/chrome/locale/ne/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ne/torbutton.properties b/src/chrome/locale/ne/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ne/torbutton.properties
+++ b/src/chrome/locale/ne/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 8eaa23f..fcde48f 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Systeem- en taalgegevens verwijderen bij gebruik van de Google zoekbalk">
 <!ENTITY torbutton.prefs.transparentTor "Transparante Torificatie (Heeft aangepaste transparente proxy of Tor router nodig)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index 1c1682a..d634cc3 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Hier klikken om plugins in te schakelen
 torbutton.panel.plugins.enabled = Hier klikken om plugins uit te schakelen
 torbutton.panel.label.disabled = Tor uitgeschakeld
 torbutton.panel.label.enabled = Tor ingeschakeld
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton heeft een actie verhinderd uit een tab die geladen werd in een andere Tor toestand.\n\n Dit is een wegens Firefoxfout 409737 en 417869.\n\n Indien deze melding zonder schijnbare reden verschijnt, dan heeft een van uw tabs geprobeerd zichzelf te herladen. Dit werd verhinderd.\n\n Om deze tab in de huidige Tor-toestand te laden, moet 'Enter' gedrukt worden in de adresbalk.\n\n
 torbutton.popup.plugin.warning = Torbutton heeft het rechtstreeks laden van plugin-inhoud verhinderd.\n\nGebruik Opslaan als.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Nota : Er zijn schijnbaar geen aangepaste certificatieauthoriteiten geïnstalleerd. De certificatieauthoriteitslijst controlleren is een langzame operatie en vertraagt een Tor wissel. Mag het isoleren van de certificatieauthoriteitscertificaten uitgeschakeld worden ? (Indien deze vraag niet verstaanbaar is, mag er op OK geklikt worden)
@@ -45,8 +45,8 @@ torbutton.popup.prompt_torbrowser = Torbutton werkt nu anders: je kan het niet m
 torbutton.popup.short_torbrowser = Belangrijke Torbutton Informatie!\n\nTorbutten is nu altijd ingeschakeld.\n\nKlik op de Torbutton voor meer informatie.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Deze website (%S) probeerde image data op een canvas te benaderen. Aangezien canvas image data gebruikt kan worden om informatie te verkrijgen over je computer, is deze keer blanco image data teruggemeld.
+canvas.allow=Toestaan in de toekomst
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Nooit voor deze site
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/nn/torbutton.dtd
+++ b/src/chrome/locale/nn/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nn/torbutton.properties b/src/chrome/locale/nn/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/nn/torbutton.properties
+++ b/src/chrome/locale/nn/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/nso/torbutton.dtd
+++ b/src/chrome/locale/nso/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/nso/torbutton.properties b/src/chrome/locale/nso/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/nso/torbutton.properties
+++ b/src/chrome/locale/nso/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/oc/torbutton.dtd
+++ b/src/chrome/locale/oc/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/oc/torbutton.properties b/src/chrome/locale/oc/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/oc/torbutton.properties
+++ b/src/chrome/locale/oc/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/or/torbutton.dtd
+++ b/src/chrome/locale/or/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/or/torbutton.properties b/src/chrome/locale/or/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/or/torbutton.properties
+++ b/src/chrome/locale/or/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pa/torbutton.properties b/src/chrome/locale/pa/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/pa/torbutton.properties
+++ b/src/chrome/locale/pa/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/pap/torbutton.dtd
+++ b/src/chrome/locale/pap/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pap/torbutton.properties b/src/chrome/locale/pap/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/pap/torbutton.properties
+++ b/src/chrome/locale/pap/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 8a5b965..0c6b88c 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "UsuÅ? nazwÄ? systemu i jÄ?zyk z zapytaÅ? Google">
 <!ENTITY torbutton.prefs.transparentTor "Przezroczysta toryfikacja (wymaga wÅ?asnego transproxy lub routera Tora)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index 93573ac..1ae6a3f 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Kliknij aby wÅ?Ä?czyÄ? wtyczki
 torbutton.panel.plugins.enabled = Kliknij aby wyÅ?Ä?czyÄ? wtyczki
 torbutton.panel.label.disabled = Tor wyÅ?Ä?czony
 torbutton.panel.label.enabled = Tor wÅ?Ä?czony
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Rozszerzenie posiada przycisk do Å?atwego wÅ?Ä?czania/wyÅ?Ä?czania proxy Tor
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton zablokowaÅ? dziaÅ?alnoÅ?Ä? z karty zaÅ?adowanej w innym stanie Tora.\n\nMa to na celu obejÅ?cie bÅ?Ä?dów Firefoksa o numerach 409737 i 417869."\nJeÅ?li to okienko pojawiÅ?o siÄ? bez powodu, jedna z kart próbuje przeÅ?adowaÄ? siÄ? w tle, i to zostaÅ?o zablokowane.\n\nAby przeÅ?adowaÄ? tÄ? kartÄ? w tym stanie Tora, wciÅ?nij 'enter' w pasku adresu.\n\n
 torbutton.popup.plugin.warning = Torbutton zablokowaÅ? bezpoÅ?rednie odwoÅ?anie do Sieci przez plugin.\n\nUżyj Zapisz jako.\n\n
 torbutton.popup.confirm_ca_certs = Informacja Torbutton: WyglÄ?da na to, że nie posiadasz dodatkowych wpisów OÅ?rodków CertyfikujÄ?cych. Posiadanie takiej listy spowalnia przeÅ?Ä?czanie trybów Tora. Czy chciaÅ?byÅ? wyÅ?Ä?czyÄ? sprawdzanie OÅ?rodków CertyfikujÄ?cych? (jeÅ?li tego nie rozumiesz, możesz bezpiecznie kliknÄ?Ä? OK)
@@ -45,8 +45,8 @@ torbutton.popup.prompt_torbrowser = Torbutton teraz dziaÅ?a inaczej: nie można
 torbutton.popup.short_torbrowser = Ważne informacje o Torbuttonie!\n\nTorbutton jest teraz ciÄ?gle wÅ?Ä?czony.\n\nKliknij Turbutton, aby dowiedzieÄ? siÄ? wiÄ?cej.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
-canvas.allowAccessKey=A
-canvas.never=Never for This Site
-canvas.neverAccessKey=e
+canvas.siteprompt=Ta strona (%S) próbowaÅ?a dostaÄ? siÄ? do danych obrazu na canvas. Jako że te dane mogÄ? byÄ? użyte do odkrycia informacji o Twoim komputerze, na razie zostaÅ? zwrócony pusty obraz.
+canvas.allow=Pozwól w przyszÅ?oÅ?ci
+canvas.allowAccessKey=P
+canvas.never=Nigdy dla tej strony
+canvas.neverAccessKey=i
diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/pms/torbutton.dtd
+++ b/src/chrome/locale/pms/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pms/torbutton.properties b/src/chrome/locale/pms/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/pms/torbutton.properties
+++ b/src/chrome/locale/pms/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ps/torbutton.dtd
+++ b/src/chrome/locale/ps/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ps/torbutton.properties b/src/chrome/locale/ps/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ps/torbutton.properties
+++ b/src/chrome/locale/ps/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index c0fa4c6..2168fda 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -46,7 +46,7 @@
 <!ENTITY torbutton.button.label "Botão do Tor">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar o Botão do Tor">
 <!ENTITY torbutton.prefs.sec_settings "Configurações de Segurança">
-<!ENTITY torbutton.prefs.block_thread "Bloquear leituras do histórico durante a utilização do Tor (importante)">
+<!ENTITY torbutton.prefs.block_thread "Bloquear leituras do histórico durante a utilização do Tor (crucial)">
 <!ENTITY torbutton.prefs.block_thwrite "Bloquear escritas no histórico durante a utilização do Tor (recomendado)">
 <!ENTITY torbutton.prefs.block_nthread "Bloquear leituras do histórico quando não estiver utilizando o Tor (opcional)">
 <!ENTITY torbutton.prefs.block_nthwrite "Bloquear escritas no histórico quando não estiver utilizando o Tor (opcional)">
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Remover plataforma e idioma das consultas da Caixa de Busca do Google">
 <!ENTITY torbutton.prefs.transparentTor "Torificação Transparente (Requer transpoxy customizado ou roteador Tor)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 9f9641e..41c791b 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Clique para habilitar plugins
 torbutton.panel.plugins.enabled = Clique para desabilitar plugins
 torbutton.panel.label.disabled = Tor desabilitado
 torbutton.panel.label.enabled = Tor habilitado
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provê um ícone para habilitar ou desabilitar rapidamente o proxy Tor
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton bloqueou atividade de uma aba carregada em um estado diferente do Tor.\n\nIsto é para contornar os bugs 409737 e 417869  do Firefox.\n\nSe este popup pareceu ter acontecido sem motivo, uma de suas abas está tentando se auto atualizar em segundo plano, e isto foi bloqueado.\n
 torbutton.popup.plugin.warning = Torbutton bloqueou carregamento do plugin de conteúdo do TOR.\n\nUse o Salvar como.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certificado de Autenticação. Verificar a lista de Certificado de Autenticação pode ser uma operação lenta para oo TOR. Gostaria de desabilitar o modo de isolamento de Certificado de Autenticação? (Se você não entendeu, o mais seguro é clicar OK)
@@ -40,13 +40,13 @@ torbutton.popup.use_tbb = Parece que você está usando o Torbutton com o Firefo
 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.
+torbutton.title.prompt_torbrowser = Informação Importante do Torbutton
+torbutton.popup.prompt_torbrowser = O Torbutton agora funciona de forma diferente: você não pode mais desliga-lo.\n\nFizemos essa mudança porque não é seguro utilizar o Torbutton em navegador que ao mesmo tempo seja usado para navegação não-Tor. Eram causados bugs demais que não pudemos resolver de nenhuma outra forma.\n\nSe você deseja continuar usando o Firefox normalmente, você deve desinstalar o Torbutton e baixar o Tor Browser Bundle. As configurações de privacidade do Tor Browser também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá em Ferramentas->Complementes->Extensões e clique no botão remover próximo ao Torbutton.
+torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora mantem-se sempre habilitado.\n\nClique no Torbutton para mais informações.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
-canvas.allowAccessKey=A
-canvas.never=Never for This Site
-canvas.neverAccessKey=e
+canvas.siteprompt=Este website (%S) tentou acessar dados sobre imagem(ns) em um elemento canvas da página. Como dados de imagem do canvas podem ser usados para descobrir informações sobre seu computador, nenhum dado de imagem foi retornado desta vez.
+canvas.allow=Permitir no Futuro
+canvas.allowAccessKey=Um
+canvas.never=Nunca para esse site
+canvas.neverAccessKey=c
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index d27af5d..14b01af 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index 8be2313..92a3bb0 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -6,8 +6,8 @@ torbutton.panel.plugins.disabled = Clique para activar plugins
 torbutton.panel.plugins.enabled = Clique para desactivar plugins
 torbutton.panel.label.disabled = Tor desactivado
 torbutton.panel.label.enabled = Tor activado
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton fornece um ícone para activar ou desactivar rapidamente o proxy Tor
-torbutton.popup.history.warning = 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
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = O Torbutton bloqueou a actividade de um separador carregado num diferente estado do Tor.\n\nIsto é para contornar os erros Firefox 409737 e 417869.\n\nSe este aviso lhe parece ter aparecido sem qualquer razão aparente, um dos separadores está a tentar recarregar-se a si próprio em segundo plano e foi bloqueado.\n\nPara recarregar o separador neste estado do Tor, seleccione 'entrar' na caixa de localização da URL.\n\n
 torbutton.popup.plugin.warning = Torbutton bloqueou o carregamento do plugin de conteúdo do Tor.\n\nUtilize o Salvar Como.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certificado de Autenticação. Verificar a lista de Certificados de Autenticação pode ser uma operação lenta para o Tor. Gostaria de desactivar o modo de isolamento de Certificados de Autenticação? (Se você não percebeu esta mensagem, o mais seguro é pressionar OK)
 torbutton.popup.ff3.warning = Aviso!\n\nO Torbutton no Firefox 3 é conhecido por dar a conhecer o seu fuso horário e os seus Live Marks, através da rede Tor.\n\nTem a certeza que deseja continuar?
@@ -24,29 +24,29 @@ torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Carregar conteúdo externo?
 torbutton.popup.external.app = Uma aplicação externa é necessário para abrir:\n\n
 torbutton.popup.external.note = \n\nNota: Aplicações externas ao Tor N�O são seguras, e podem dar a conhecer a sua origem!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.external.suggest = \nSe este ficheiro não é seguro, deve guardá-lo para visualizar offline ou numa VM,\nou considere usar uma proxy transparente do Tor como a Tails LiveCD ou torsocks.\n
 torbutton.popup.launch = Correr aplicação
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = Sempre correr aplicações daqui para a frente
 torbutton.popup.test.no_http_proxy = Teste ao proxy Tor: Erro na ligação ao proxy HTTP local. O Polipo está em execução?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-torbutton.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.
+torbutton.popup.captcha.title = Evitar Captchas do Google?
+torbutton.popup.captcha.ask = O Torbutton detectou uma Captcha do Google. Pretende ser redireccionado para um novo motor de busca usando esta consulta?
+torbutton.popup.captcha.always = Siga sempre este procedimento de agora em diante
+torbutton.popup.redirect = Redireccione
+torbutton.popup.no_redirect = Não redireccione
+torbutton.popup.prompted_language = Para lhe fornecer maior privacidade, o Torbutton pode requerer o uso da versão em inglês em páginas da Internet. Isto pode causar a visualização em inglês das páginas que prefere ler em português.\n\nPretende visualizar páginas em inglês, para melhor privacidade?
+torbutton.popup.no_newnym = O Torbutton não pode, em segurança, fornecer-lhe uma nova identidade. Não tem acesso à porta de controle Tor.\n\nEstá a usar o Tor Browser Bundle?
+torbutton.popup.use_tbb = Parece estar a usar Torbutton com Firefox, o que já não é recomendado como uma configuração segura.\n\nEm alternativa, sugerimos que obtenha o último Tor Browser Bundle através de envio de e-mail para: gettor@xxxxxxxxxxxxxx ou carregando para o computador o ficheiro na seguinte URL:
+torbutton.popup.pref_error = O Torbutton não consegue actualizar as preferências na directoria do perfil do Explorador do Tor.
+torbutton.popup.permission_denied = Por favor restabeleça as permissões da directoria do Explorador do Tor ou copie para uma nova localização.
+torbutton.popup.device_full = O disco parece estar cheio. Por favor liberte espaço ou relocalize o Explorador do Tor para um novo dispositivo.
+torbutton.title.prompt_torbrowser = Informação importante do Torbutton
+torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma diferente: já não pode desligá-lo.\n\nProcedemos a esta alteração porque não é seguro usar o Torbutton num explorador também usado para buscas fora do Tor. Havia demasiados erros que não conseguimos corrigir de outra forma.\n\nSe pretende continuar a usar o Firefox normalmente, deve desinstalar o Torbutton e carregar o Tor Browser Bundle para o seu computador. As políticas de privacidade do Explorador do Tor também são superiores às normais no Firefox, mesmo quando este é usado com o Torbutton.\n\nPara remover o Torbutton abra Ferramentas->Acessórios->Extensões e clique no botão Remover junto ao Torbutton.
+torbutton.popup.short_torbrowser = Informação importante do Torbutton!\nO Torbutton não está sempre activo.\nClique no Torbutton para mais informação.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Esta página (%S) tentou aceder a dados de imagem em tela. Porque os dados de imagem em tela podem ser usados para revelar informação acerca do seu computador, neste momento foram devolvidos dados de imagem em branco.
+canvas.allow=Permitir no futuro
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Nunca para ESTE SITE
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 1469969..57867a8 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -16,32 +16,32 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Portul:">
 <!ENTITY torbutton.about.title "Despre Torbutton">
-<!ENTITY torbutton.about.version "Version:">
+<!ENTITY torbutton.about.version "Versiune:">
 <!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
-<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.code "Contribuitori Cod:">
 <!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 "Revizie Securitate:">
+<!ENTITY torbutton.about.donate "Daca va place sa utiliuzati Tor, ati putea considera:">
+<!ENTITY torbutton.about.make_donation "faceti o donatie.">
 <!ENTITY torbutton.pref_connection.notice "DezactivaÅ£i Torbutton pentru a schimba aceste setÄ?ri.">
 <!ENTITY torbutton.pref_connection.more_info "Informatii suplimentare">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajutor">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton este activatÄ? în acest moment. DacÄ? doriÅ£i sÄ? schimbaÅ£i setÄ?rile non-proxy Tor, dezactivaÅ£i Torbutton Å?i vÄ? rugÄ?m sÄ? reveniÅ£i aici. DacÄ? doriÅ£i sÄ? vÄ? schimbaÅ£i setÄ?rile Tor, vÄ? rugÄ?m sÄ? folosiÅ£i fereastra de preferinÅ£Ä? Torbutton.">
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
-<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!ENTITY torbutton.context_menu.new_identity "Identitate noua">
+<!ENTITY torbutton.context_menu.new_identity_key "l">
 <!ENTITY torbutton.context_menu.toggle "Comutarea starii Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "PreferinÈ?e...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Despre Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "Protectii Cookie-uri.">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor "Copiaza URL-ul Tor">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab "Deschide URL-ul Tor intr-o noua fila.">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "Deschide URL-ul Tor intr-o noua fereastra.">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Butonul Tor">
 <!ENTITY torbutton.button.tooltip "ApasÄ? pentru pornirea Torbutton">
@@ -85,7 +85,7 @@
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "La îniÈ?ierea sesiunii restaurate, fixeazÄ? statutul Tor la:">
-<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "La pornirea browserului, seteaza starea Tor la:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "RestaureazÄ?/È?terge cookie-urile dupÄ? avarierea Firefox">
 <!ENTITY torbutton.prefs.dual_cookie_jars "SalveazÄ? cookie-urile Tor È?i Non-Tor în fiÈ?iere protejate (periculos)">
 <!ENTITY torbutton.prefs.clear_http_auth "È?terge sesiunile de autentificare HTTP (recomandat)">
@@ -122,16 +122,16 @@
 <!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.lockCol "Protejat">
+<!ENTITY torbutton.cookiedialog.domainCol "Gazda">
+<!ENTITY torbutton.cookiedialog.nameCol "Nume">
+<!ENTITY torbutton.cookiedialog.pathCol "Cale">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protejeaza Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Indeparteaza 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.removeAllBut "Indeparteaza tot, mai putin protejat">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi">
 <!ENTITY torbutton.prefs.disable_livemarks "OpreÅ?te actualizÄ?rile Livemark în timpul funcÅ£ionÄ?ri lui Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(recomandat)">
 <!ENTITY torbutton.prefs.dtd_optional "(opÈ?ional)">
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "EliminaÈ?i informaÈ?ii despre platformÄ? È?i limbÄ? din cererile câmpurilor de cÄ?utare Google">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties
index bdf5f99..3b35ee8 100644
--- a/src/chrome/locale/ro/torbutton.properties
+++ b/src/chrome/locale/ro/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click pentru a porni plugin-urile
 torbutton.panel.plugins.enabled = Click pentru a opri plugin-urile
 torbutton.panel.label.disabled = Tor a fost oprit
 torbutton.panel.label.enabled = Tor a fost pornit
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton prevede un buton pentru a activa sau dezactiva cu un click proxy-ul Tor din Firefox
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton a blocat activitatea unei file încÄ?rcate într-un alt stat Tor.\nAcesta este pentru a lucru cu bug-urile 409737 Å?i 417869 din Firefox.\nDacÄ? acest pop-up pÄ?re sÄ? se aparÄ? fÄ?rÄ? nici un motiv, una dintre filele care încercÄ? sa se reîncarce singurÄ? în fundal, a fost blocatÄ?.\n\nPentru a reîncÄ?rca fila în aceastÄ? stare Tor, apasÄ? "Enter" în caseta de URL.\n\n
 torbutton.popup.plugin.warning = Torbutton a blocat direct Tor pentru a încÄ?rca conÅ£inutul plugin.\n\nUtilizaÅ£i SalvaÅ£i-Ca în loc.\n\n
 torbutton.popup.confirm_ca_certs = ObservaÅ£ie Torbutton: Se pare cÄ? nu aveÅ£i nici un Certificat de autoritate. Examinarea listei cu Certificate de Autoritate este o operaÅ£ie lentÄ? Å?i încetineÅ?te comutare Tor. DoriÅ£i sÄ? dezactivaÅ£i izolarea Certificatelelor de autoritate? (DacÄ? nu înÅ£elegem acest lucru, este sigur sÄ? faceÅ£i clic pe OK)
@@ -41,12 +41,12 @@ torbutton.popup.pref_error = Torbutton nu poate actualiza preferintele in direct
 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 = Informatii importante Torbutton
-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.
+torbutton.popup.prompt_torbrowser = Torbutton lucreaza diferit acum: nu mai poate fi inchis. Am facut aceasta schimbare deoarece Torbutton nu poate fi folosit in siguranta intr-un browser care e utilizat si pentru navigare non-Tor. Erau prea multe buguri pe care nu le puteam remedia in alt fel. Daca doriti sa continuati sa folositi Firefox normal, ar trebui sa dezinstalati Torbutton si sa descarcati Tor Browser Bundle. Proprietatile de navigare privata ale Tor Browser sunt deasemenea superioare celor ale Firefox normal, chiar si atunci cand Firefox este folosit cu Torbutton. Sa indepartati Torbutton, mergeti la Unelte->Suplimente->Extensii si faceti click pe butonul Elimina de langa Torbutton.
+torbutton.popup.short_torbrowser = Informatie Torbutton importanta! Torbutton este acum permanent activat. Faceti click pe Torbutton pentru mai multe informatii.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.allow=Permiteti in viitor.
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Niciodata pentru acest site.
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 84a964c..6c0fca5 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "УдалÑ?Ñ?Ñ? Ñ?ведениÑ? о плаÑ?Ñ?оÑ?ме и Ñ?зÑ?ке из запÑ?оÑ?ов Ñ?Ñ?Ñ?оки поиÑ?ка Google">
 <!ENTITY torbutton.prefs.transparentTor "Ð?Ñ?озÑ?аÑ?наÑ? Ñ?оÑ?иÑ?икаÑ?иÑ? (ТÑ?ебÑ?еÑ? полÑ?зоваÑ?елÑ?Ñ?киÑ? transproxy или Tor-маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?а)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index 0fd195a..3066c36 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -6,7 +6,7 @@ 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 = Ð?нопка вклÑ?Ñ?ениÑ?/оÑ?клÑ?Ñ?ениÑ? доÑ?Ñ?Ñ?па к Ð?нÑ?еÑ?неÑ? Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton заблокиÑ?овал дейÑ?Ñ?виÑ? Ñ? закладки, загÑ?Ñ?женной из дÑ?Ñ?гого Ñ?оÑ?Ñ?оÑ?ниÑ? Tor.\n\nЭÑ?о Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? длÑ? обÑ?ода деÑ?екÑ?ов Firefox 409737 417869.\n\nÐ?Ñ?ли Ñ?Ñ?о пÑ?едÑ?Ñ?еждение возникло без пÑ?иÑ?инÑ?, одна из ваÑ?иÑ? закладок попÑ?Ñ?алаÑ?Ñ? пеÑ?езагÑ?Ñ?зиÑ?Ñ?Ñ?Ñ? в Ñ?оновом Ñ?ежиме, и Ñ?Ñ?а попÑ?Ñ?ка бÑ?ла пÑ?еÑ?еÑ?ена.\n\nÐ?лÑ? пеÑ?езагÑ?Ñ?зки закладки в Ñ?екÑ?Ñ?ем Ñ?оÑ?Ñ?оÑ?нии Tor, нажмиÑ?е 'enter' в адÑ?еÑ?ной Ñ?Ñ?Ñ?оке URL.\n\n
 torbutton.popup.plugin.warning = Torbutton заблокиÑ?овал пÑ?Ñ?мÑ?Ñ? загÑ?Ñ?зкÑ? плагинов Ñ?еÑ?ез Tor.\n\nÐ?агÑ?Ñ?жайÑ?е командой СоÑ?Ñ?аниÑ?Ñ? как.\n\n
 torbutton.popup.confirm_ca_certs = Ð?Ñ?имеÑ?ание: Ð?Ñ?евидно Ñ? ваÑ? неÑ? индивидÑ?алÑ?нÑ?Ñ? СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии. Ð?Ñ?овеÑ?ка Ñ?пиÑ?ка СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии медленнаÑ? опеÑ?аÑ?иÑ? и замедлÑ?еÑ? пеÑ?еклÑ?Ñ?ение Tor. ХоÑ?иÑ?е оÑ?клÑ?Ñ?иÑ?Ñ? изолÑ?Ñ?иÑ? СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии? (Ð?Ñ?ли Ð?Ñ? не понимаеÑ?е о Ñ?ем Ñ?еÑ?Ñ?, безопаÑ?ней нажаÑ?Ñ? OK)
@@ -40,13 +40,13 @@ torbutton.popup.use_tbb = Ð?оÑ?оже, Ñ?Ñ?о вÑ? иÑ?полÑ?зÑ?еÑ?е Torbu
 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.
+torbutton.title.prompt_torbrowser = Ð?ажнаÑ? инÑ?оÑ?маÑ?иÑ? Torbutton
+torbutton.popup.prompt_torbrowser = Torbutton Ñ?абоÑ?аеÑ? по-дÑ?Ñ?гомÑ?. Ð?Ñ? не можеÑ?е вÑ?клÑ?Ñ?иÑ?Ñ? его болÑ?Ñ?е â?? â?? Ð?Ñ? Ñ?делали Ñ?Ñ?о изменение, поÑ?омÑ? Ñ?Ñ?о Ñ?Ñ?о не безопаÑ?но иÑ?полÑ?зоваÑ?Ñ? Torbutton в бÑ?аÑ?зеÑ?е, коÑ?оÑ?Ñ?й Ñ?акже иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? длÑ? не-Tor пÑ?оÑ?моÑ?Ñ?а. СÑ?Ñ?еÑ?Ñ?вовали Ñ?лиÑ?ком много оÑ?ибок Ñ?ам, Ñ?Ñ?о мÑ? не могли иÑ?пÑ?авиÑ?Ñ? никаким дÑ?Ñ?гим Ñ?поÑ?обом. â?? â?? Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е пÑ?одолжаÑ?Ñ? иÑ?полÑ?зоваÑ?Ñ? Firefox ноÑ?малÑ?но, вÑ? должнÑ? Ñ?далиÑ?Ñ? Torbutton и Ñ?каÑ?аÑ?Ñ? Tor Browser Bundle. СвойÑ?Ñ?ва конÑ?иденÑ?иалÑ?ноÑ?Ñ?и Tor Browser Ñ?акже пÑ?евоÑ?Ñ?одÑ?Ñ? обÑ?Ñ?нÑ?й Firefox, даже еÑ?ли Firefox иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? Ñ? Torbutton. â?? â?? ЧÑ?обÑ? Ñ?далиÑ?Ñ? Torbutton, пеÑ
 ?ейдиÑ?е в менÑ? СеÑ?виÑ?-> Ð?ополнениÑ?-> РаÑ?Ñ?иÑ?ениÑ?, а заÑ?ем нажмиÑ?е кнопкÑ? УдалиÑ?Ñ? Ñ?Ñ?дом Ñ? Torbutton.
+torbutton.popup.short_torbrowser = Ð?ажнаÑ? инÑ?оÑ?маÑ?иÑ? Torbutton! â?? â?? Torbutton Ñ?епеÑ?Ñ? вÑ?егда вклÑ?Ñ?ен. â?? â?? Ð?ажмиÑ?е на Torbutton длÑ? полÑ?Ñ?ениÑ? дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.allow=Ð?озволиÑ? в бÑ?дÑ?Ñ?ем
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Ð?икогда длÑ? Ñ?Ñ?ого Ñ?айÑ?а
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/sco/torbutton.dtd
+++ b/src/chrome/locale/sco/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sco/torbutton.properties b/src/chrome/locale/sco/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/sco/torbutton.properties
+++ b/src/chrome/locale/sco/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/sk/torbutton.dtd
+++ b/src/chrome/locale/sk/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sk/torbutton.properties b/src/chrome/locale/sk/torbutton.properties
index fe21f72..d3dc9f7 100644
--- a/src/chrome/locale/sk/torbutton.properties
+++ b/src/chrome/locale/sk/torbutton.properties
@@ -6,7 +6,7 @@ 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
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 28d9589..88e1b61 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sl/torbutton.properties b/src/chrome/locale/sl/torbutton.properties
index 67c140b..c2903e8 100644
--- a/src/chrome/locale/sl/torbutton.properties
+++ b/src/chrome/locale/sl/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Klikni da omogoÄ?iÅ¡ dodatke
 torbutton.panel.plugins.enabled = Klikni da onemogoÄ?iÅ¡ dodatke
 torbutton.panel.label.disabled = Anonimizacija izkljuÄ?ena
 torbutton.panel.label.enabled = Anonimizacija vkljuÄ?ena
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton razÅ¡iritev omogoÄ?a enostavno vkljuÄ?itev ali izkljuÄ?itev povezave preko anonimizacijskega omrežja Tor
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton obvestilo: Zdi se da nimate prirejenih dovoljenj za certifikate. pregledovanje dovoljenj za certifikate je poÄ?asno in upoÄ?asni preklop Tor-a. bi radi onemogoÄ?ili izloÄ?evanje certifikata za dovoljenje certifikatov? (Ä?e tega ne razumete, je varno da pritisnete OK)
diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/so/torbutton.dtd
+++ b/src/chrome/locale/so/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/so/torbutton.properties b/src/chrome/locale/so/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/so/torbutton.properties
+++ b/src/chrome/locale/so/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/son/torbutton.dtd
+++ b/src/chrome/locale/son/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/son/torbutton.properties b/src/chrome/locale/son/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/son/torbutton.properties
+++ b/src/chrome/locale/son/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sq/torbutton.properties b/src/chrome/locale/sq/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/sq/torbutton.properties
+++ b/src/chrome/locale/sq/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd
index 52c141f..2dbf08c 100644
--- a/src/chrome/locale/sr/torbutton.dtd
+++ b/src/chrome/locale/sr/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Скини плаÑ?Ñ?оÑ?мÑ? и Ñ?език Ñ?а Google пÑ?еÑ?Ñ?аживаÑ?а">
 <!ENTITY torbutton.prefs.transparentTor "ТÑ?анÑ?паÑ?енÑ?а ТоÑ?иÑ?икаÑ?иÑ?а (заÑ?Ñ?ева поÑ?ебан Tor пÑ?окÑ?и или Tor Ñ?Ñ?Ñ?еÑ?)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sr/torbutton.properties b/src/chrome/locale/sr/torbutton.properties
index 6daf7da..8fb453f 100644
--- a/src/chrome/locale/sr/torbutton.properties
+++ b/src/chrome/locale/sr/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Ð?ликниÑ?е да биÑ?Ñ?е омогÑ?Ñ?
 torbutton.panel.plugins.enabled = Ð?ликниÑ?е да биÑ?Ñ?е онемогÑ?Ñ?или додаÑ?ке
 torbutton.panel.label.disabled = ТоÑ? Ñ?е онемогÑ?Ñ?ен
 torbutton.panel.label.enabled = ТоÑ? Ñ?е омогÑ?Ñ?ен
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = ТоÑ?баÑ?он пÑ?Ñ?жа дÑ?гме за лакÑ?е Ñ?кÑ?Ñ?Ñ?иваÑ?е и иÑ?кÑ?Ñ?Ñ?иваÑ?е поÑ?Ñ?едниÑ?ке мÑ?еже ТоÑ? на ФаÑ?еÑ?Ñ?окÑ?Ñ?.
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = ТоÑ?баÑ?он Ñ?е блокиÑ?ао акÑ?ивноÑ?Ñ?и из Ñ?езиÑ?ка коÑ?и Ñ?е Ñ?Ñ?иÑ?ан Ñ? дÑ?Ñ?гаÑ?иÑ?ем ТоÑ? Ñ?Ñ?аÑ?Ñ?.\n\nÐ?во Ñ?е деÑ?ава Ñ? Ñ?иÑ?Ñ? Ñ?еÑ?аваÑ?а ФаÑ?еÑ?Ñ?окÑ?овиÑ? гÑ?еÑ?ака 409737 и 417869.\n\nУколико пÑ?имеÑ?иÑ?е да Ñ?е оваÑ? иÑ?каÑ?Ñ?Ñ?и пÑ?озоÑ? поÑ?авÑ?Ñ?Ñ?е без икаквог Ñ?азлога, Ñ?о знаÑ?и да Ñ?едан од ваÑ?иÑ? Ñ?езиÑ?ака покÑ?Ñ?ава да Ñ?е поново Ñ?Ñ?иÑ?а Ñ?ам од Ñ?ебе, а Ñ?о Ñ?е блокиÑ?ано.\n\nÐ?а биÑ?Ñ?е поново Ñ?Ñ?иÑ?али Ñ?езиÑ?ак Ñ? овом ТоÑ? Ñ?Ñ?аÑ?Ñ?, пÑ?иÑ?иÑ?ниÑ?е Enter Ñ? поÑ?Ñ? за Ñ?ноÑ? веб адÑ?еÑ?е.\n\n
 torbutton.popup.plugin.warning = ТоÑ?баÑ?он Ñ?е блокиÑ?ао диÑ?екÑ?но Ñ?Ñ?иÑ?аваÑ?е Ñ?адÑ?жаÑ?а додаÑ?ка.\n\nУмеÑ?Ñ?о Ñ?ога, коÑ?иÑ?Ñ?иÑ?е â??СаÑ?Ñ?ваÑ? каоâ?¦â??.\n\n
 torbutton.popup.confirm_ca_certs = Ð?апомена: изгледа да не поÑ?едÑ?Ñ?еÑ?е пÑ?илагоÑ?ене Ñ?еÑ?Ñ?иÑ?икаÑ?е. Ð?Ñ?пиÑ?иваÑ?е Ñ?пиÑ?ка Ñ?еÑ?Ñ?иÑ?икаÑ?а Ñ?е Ñ?поÑ?а Ñ?адÑ?а и Ñ? многоме Ñ?Ñ?поÑ?ава Tor мÑ?ежÑ?. Ð?а ли желиÑ?е да онемогÑ?Ñ?иÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?е? (Уколико не Ñ?азÑ?меÑ?е ово, безбедно Ñ?е да кликнеÑ?е на â??У Ñ?едÑ?â??.)
diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/st/torbutton.dtd
+++ b/src/chrome/locale/st/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/st/torbutton.properties b/src/chrome/locale/st/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/st/torbutton.properties
+++ b/src/chrome/locale/st/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/su/torbutton.dtd
+++ b/src/chrome/locale/su/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/su/torbutton.properties b/src/chrome/locale/su/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/su/torbutton.properties
+++ b/src/chrome/locale/su/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 465760a..b1b22f3 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -1,7 +1,7 @@
 <!ENTITY torbutton.prefs.title "Inställningar för Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
+<!ENTITY torbutton.prefs.display_settings "Visa Inställningar">
 <!ENTITY torbutton.prefs.display_panel "Visa inställningar för Tor proxy i statusraden">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
+<!ENTITY torbutton.prefs.panel_format "Status meny visningsformat">
 <!ENTITY torbutton.prefs.panel_text_format "Text">
 <!ENTITY torbutton.prefs.panel_icon_format "Ikon">
 <!ENTITY torbutton.prefs.tor_settings "Inställningar för proxy">
@@ -26,7 +26,7 @@
 <!ENTITY torbutton.pref_connection.notice "Avaktivera Torbutton för att ändra dessa inställningar.">
 <!ENTITY torbutton.pref_connection.more_info "Mer information">
 <!ENTITY torbutton.pref_connection_more_info.title "Hjälp">
-<!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 är för närvarande aktiverad. Om du vill ändra dina icke-Tor proxy inställningar, var vänlig avaktivera Torbutton och kom tillbaka hit. Om du vill ändra dina Tor inställningar, var vänlig använd Torbuttons inställningsruta.">
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.toggle "Slå på/av Tor">
@@ -35,13 +35,13 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Om Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "Kak Skydd">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor "Kopiera 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 "Ã?ppna Tor URL i ny Flik">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow "Ã?ppna Tor URL i ny Ruta">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klicka för att installera Torbutton">
@@ -53,42 +53,42 @@
 <!ENTITY torbutton.prefs.clear_history "Rensa historik vid på/avslagning av Tor (valfritt)">
 <!ENTITY torbutton.prefs.clear_cache "Rensa diskcache vid på/avslagning av Tor">
 <!ENTITY torbutton.prefs.block_cache "Blockera åtkomst till disk- och minnescache medan Tor är aktiverat">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.cookie_jars "Lagra icke-Tor kakor i en skyddad burk">
+<!ENTITY torbutton.prefs.cookie_protection "Använd Kak Skydd Dialogen för att välja">
 <!ENTITY torbutton.prefs.mmm_cookies "Jag sköter cookies manuellt (farligt)">
 <!ENTITY torbutton.prefs.clear_cookies "Rensa cookies vid på/avaktivering av Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Avaktivera plugins när Tor används (kritiskt)">
 <!ENTITY torbutton.prefs.kill_bad_js "FÃ¥nga farligt javascript (kritiskt)">
-<!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.isolate_content "Isolera dynamiskt innehåll till Tor stadium (kritiskt)">
+<!ENTITY torbutton.prefs.no_updates "Avaktivera uppdateringar under Tor användning">
+<!ENTITY torbutton.prefs.set_uagent "Välj användaragent för Tor användning (kritiskt)">
+<!ENTITY torbutton.prefs.dynamic "Dynamiskt Innehåll">
 <!ENTITY torbutton.prefs.cookies "Kakor">
 <!ENTITY torbutton.prefs.cache "Cache">
 <!ENTITY torbutton.prefs.history "Historia">
 <!ENTITY torbutton.prefs.no_search "Stäng av sökmotorers förslag under användning av Tor (rekommenderas)">
 <!ENTITY torbutton.prefs.shutdown "Stäng av">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!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.tor_shutdown "Rensa Tor kakor under Tor-aktiverad webbläsaravstängning">
+<!ENTITY torbutton.prefs.all_shutdown "Rensa kakor under alla webbläsaravstängningar">
+<!ENTITY torbutton.prefs.no_shutdown "Rensa inte mina kakor vid avstängning">
+<!ENTITY torbutton.prefs.disable_sessionstore "Avaktivera Sessionssparande (rekommenderas)">
+<!ENTITY torbutton.prefs.headers "Huvuden">
+<!ENTITY torbutton.prefs.spoof_english "Härma US Engelsk Webbläsare">
+<!ENTITY torbutton.prefs.refererspoofing "Refererings härmning">
 <!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 "Smart referat härmning under Tor användning (härmar kors domän referat)">
 <!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.disable_domstorage "Avaktivera DOM lagring under Tor användning (kritiskt)">
+<!ENTITY torbutton.prefs.forms "Former">
 <!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.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.non_tor "Icke-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.clear_http_auth "Rensa HTTP auth sessioner (rekommenderat)">
 <!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)">
@@ -117,10 +117,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
 <!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
 <!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.nospoof "Ingen referat härmning under Tor användning (skicka referat som normalt)">
 <!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.prefs.spoofblank "Härma blankt referat under Tor användning (kan störa vissa sidor)">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index 50e0a98..75fe0b7 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -6,16 +6,16 @@ torbutton.panel.plugins.disabled = Klicka för att aktivera plugins
 torbutton.panel.plugins.enabled = Klicka för att inaktivera plugins
 torbutton.panel.label.disabled = Tor inaktiv
 torbutton.panel.label.enabled = Tor aktiv
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton ger en knapp för att enkelt aktivera eller inaktivera peka Firefox till 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
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blockerade aktivitet från en flik laddad i ett annat Tor stadium.\n\nDetta är för att komma runt Firefox buggar 409737 och 417869.\n\nOm denna popup verkar hända av ingen anledning, så är det för att en av dina flikar försökte ladda om sig i bakgrunden, och detta blev blockerat.\n\nFör att ladda om fliken i detta Tor stadium klicka 'enter' i URL address fältet.\n\n
 torbutton.popup.plugin.warning = Torbutton blockerade direkt Tor belastning insticksprogram.\n\nAnvänd spara som i stället.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.confirm_ca_certs = Torbutton Notering: Det verkar som om du inte har någon anpassad Certifikat Instans. Att undersöka Certifikat Instans listan är långsamt och saktar ner Tor. Skulle du vilja avaktivera isolationen av Certifikat Instans certifikat? (om du inte förstår detta är det säkert att klicka OK)
 torbutton.popup.ff3.warning = Varning!\n\nTorbutton på Firefox 3 är känt för att läcka din tidszon och livemarks via Tor. \n\nVill du fortsätta ändå?
 torbutton.popup.toggle.warning = Du måste växla Tor eller starta för inställningarna ska börja gälla.
 torbutton.popup.test.success = Tor-proxy testet lyckades!
 torbutton.popup.test.failure = Tor proxy MISSLYCKADES! Kontrollera din proxy och inställningar polipo.
-torbutton.popup.test.confirm_toggle = 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 = Klicka på OK för att testa Tor proxyinställningar. Detta test kommer att ske i bakgrunden. Ha tålamod.
+torbutton.popup.test.confirm_toggle = Det senaste Tor proxy testet misslyckades att använda Tor.\n\n�r du säker att du vill aktivera ändå?\n\nNotera: Om du fixat problemet kan du köra om testet i Torbuttons Proxy Preferenser för att eliminera denna varning.
+torbutton.popup.test.ff3_notice = Klicka på OK för att testa Tors proxyinställningar. Detta test kommer att ske i bakgrunden. Ha tålamod.
 torbutton.panel.label.verified = Tor verifierad
 torbutton.popup.test.auto_failed = Den automatiska Tor proxy misslyckades att använda Tor.\n\n�r du säker på att du vill aktivera ändå?
 torbutton.prefs.recommended = (rekommenderat)
@@ -30,23 +30,23 @@ torbutton.popup.cancel = Avbryt
 torbutton.popup.dontask = Alltid starta program från och med nu
 torbutton.popup.test.no_http_proxy = Tor proxy test: Lokal HTTP Proxy är onåbar. �r Polipo igång ordentligt?
 torbutton.popup.captcha.title = Undvik Google Captchas?
-torbutton.popup.captcha.ask = Torbutton upptäckt en Google Captcha. Vill du att omdirigeras till en annan sökmotor för den här frågan?
+torbutton.popup.captcha.ask = Torbutton upptäckte en Google Captcha. Vill du att omdirigeras till en annan sökmotor för den här frågan?
 torbutton.popup.captcha.always = Utför alltid denna åtgärd från och med nu
 torbutton.popup.redirect = Omdirigera
 torbutton.popup.no_redirect = Omdirigera inte
-torbutton.popup.prompted_language = 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.prompted_language = För att ge dig mer privatliv kan Torbutton begära en Engelsk version av webbsidor. Detta kan göra att webbsidor som du föredrar att läsa på ett annat språk visas på Engelska istället.\\n\\n Vill du visa sidor på Engelska för bättre privatliv?
 torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
+torbutton.popup.use_tbb = Det verkar som om du använder Torknappen med Firefox, vilket inte längre är en rekommenderad säker konfiguration.\n\nIstället rekommenderar vi dig att ladda ner den senaste Tor Browser Bundle genom att skicka ett mail till gettor@xxxxxxxxxxxxxx eller ladda ner den på följande URL:
 torbutton.popup.pref_error = Torbutton kan inte uppdatera inställningar i Tor Browser profilen katalog.
 torbutton.popup.permission_denied = Du antingen återställa behörigheterna Tor Browser katalogen eller kopiera den till en ny plats.
 torbutton.popup.device_full = Skivan verkar vara full. Vänligen frigöra utrymme eller flytta Tor webbläsare till en ny enhet.
 torbutton.title.prompt_torbrowser = Viktig 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.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Torknappen och ladda ner Tor Browser Bundle. Tor Webbläsaren skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Torknappen.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta Bort knappen bredvid Torknappen. 
 torbutton.popup.short_torbrowser = Viktig Torbutton information!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för mer information.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Denna webbsida (%S) försökte komma åt bild data på ett kanvas. Eftersom kanvas bild data kan användas för att upptäcka information om din dator skickades vi tom bild data denna gång.
+canvas.allow=Tillåt i Framtiden
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Aldrig för Denna Sida
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/sw/torbutton.properties b/src/chrome/locale/sw/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/sw/torbutton.properties
+++ b/src/chrome/locale/sw/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ta/torbutton.dtd
+++ b/src/chrome/locale/ta/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ta/torbutton.properties b/src/chrome/locale/ta/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ta/torbutton.properties
+++ b/src/chrome/locale/ta/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/te/torbutton.dtd
+++ b/src/chrome/locale/te/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/te/torbutton.properties b/src/chrome/locale/te/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/te/torbutton.properties
+++ b/src/chrome/locale/te/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/tg/torbutton.dtd
+++ b/src/chrome/locale/tg/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/tg/torbutton.properties b/src/chrome/locale/tg/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/tg/torbutton.properties
+++ b/src/chrome/locale/tg/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 6cfe1c1..505898a 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/th/torbutton.properties b/src/chrome/locale/th/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/th/torbutton.properties
+++ b/src/chrome/locale/th/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ti/torbutton.dtd
+++ b/src/chrome/locale/ti/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ti/torbutton.properties b/src/chrome/locale/ti/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ti/torbutton.properties
+++ b/src/chrome/locale/ti/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/tk/torbutton.dtd
+++ b/src/chrome/locale/tk/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/tk/torbutton.properties b/src/chrome/locale/tk/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/tk/torbutton.properties
+++ b/src/chrome/locale/tk/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index ffc190a..180590d 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -145,3 +145,7 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Kaldır platform ve Google Arama Kutusu gelen dil sorgular">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index dfe88ba..24467e0 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Eklentileri etkinleÅ?tirmek için tıklayın
 torbutton.panel.plugins.enabled = Eklentileri pasif hale getirmek için tıklayın
 torbutton.panel.label.disabled = Tor DevredıÅ?ı
 torbutton.panel.label.enabled = Tor Etkin
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbuton, Tor proxy'yi hızlıca aktif veya pasif duruma getirebileceÄ?iniz bir düÄ?me saÄ?lar.
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Bu sekmeyi Tor aktifken kullanırken, Tor'u devre dıÅ?ı bırakıp yenileyip ya da kullanmaya devam ederseniz, içerik otomatik olarak bloklanır.\n\nBu Firefox 409737 ve 417869 nolu hata raporlarını için bir çözümdür.\n\nHiçbir sebep yokken bu uyarı aldıysanız, muhtelemelen sekme kendini yenilemeye çalıÅ?tıÄ?ı için engellenmiÅ? olabilir.\n\nSekmeyi yenilemek için lütfen adres çubuÄ?unu tıklayıp devam etmeyi deneyin.\n\n
 torbutton.popup.plugin.warning = Torbutton Tor'un eklenti içeriÄ?ini yüklemesini blokladı.\n\nFarklı Kaydet ile yapmayı deneyin.\n\n
 torbutton.popup.confirm_ca_certs = Torbuton hatırlatma: AnlaÅ?ılan özel sertifakanız yok. DoÄ?rulama bilgisi her zaman iÅ?lemleri yavaÅ?latır. Sertifika doÄ?rulamalarını devredıÅ?ı bırakmak ister misiniz? (Açıklamayı anlamadıysan, Tamam'a tıkla)\n            
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index e371357..fd307a2 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/uk/torbutton.properties b/src/chrome/locale/uk/torbutton.properties
index 0999774..4eb40a9 100644
--- a/src/chrome/locale/uk/torbutton.properties
+++ b/src/chrome/locale/uk/torbutton.properties
@@ -6,7 +6,7 @@ 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 надаÑ? кнопкÑ? длÑ? зÑ?Ñ?Ñ?ного Ñ?вÑ?мкненнÑ? Ñ?а вимкненнÑ? викоÑ?иÑ?Ñ?аннÑ? Tor веб-оглÑ?даÑ?ем Firefox
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ur/torbutton.dtd
+++ b/src/chrome/locale/ur/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ur/torbutton.properties b/src/chrome/locale/ur/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ur/torbutton.properties
+++ b/src/chrome/locale/ur/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/ve/torbutton.dtd
+++ b/src/chrome/locale/ve/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/ve/torbutton.properties b/src/chrome/locale/ve/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/ve/torbutton.properties
+++ b/src/chrome/locale/ve/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 68bd590..a58317d 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index 900bf7d..798abae 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Nhấn Ä?á»? bật phần bá»? trợ
 torbutton.panel.plugins.enabled = Nhấn Ä?á»? tắt phần bá»? trợ
 torbutton.panel.label.disabled = Tor b� tắt
 torbutton.panel.label.enabled = Tor Ä?ược bật
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton cung cấp má»?t nút Ä?á»? dá»? dàng bật hoặc tắt viá»?c chuyá»?n hÆ°á»?ng Firefox Ä?ến proxy Tor
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton khóa những thẻ trình duyá»?t Ä?ã tải trong má»?t trạng thái khác của Tor.\n\nCái này là Ä?á»? vận hành xung quanh lá»?i Firefox 409737 và 417869.\n\nNếu thông báo này hiá»?n ra chẳng vì lý do nào, thì má»?t trong những thẻ trình duyá»?t Ä?ang cá»? tá»± tải lại mà không thông báo, và Ä?iá»?u này Ä?ã bá»? ngÄ?n chặn.\n\nTor tải lại thẻ trình duyá»?t trong trạng thái này của Tor, gõ 'enter' trên thanh Ä?á»?a chá»?.\n\n
 torbutton.popup.plugin.warning = Torbutton chặn vi�c tải trực tiếp Tor n�i dung phần b� trợ.\n\nNên dùng Lưu Dư�i Dạng.\n\n
 torbutton.popup.confirm_ca_certs = LÆ°u ý Torbutton: Có vẻ bạn không có Nhà cấp phát Chứng thÆ° (CA) tùy biến. Kiá»?m tra danh sách CA là má»?t quá trình khá lâu và sẽ làm chậm viá»?c bật tắt Tor. Bạn có muá»?n vô hiá»?u hóa viá»?c cô lập các chứng thÆ° của CA không? (Nếu bạn không hiá»?u viá»?c này, cứ nhấn OK là Ä?ược) 
diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/wa/torbutton.dtd
+++ b/src/chrome/locale/wa/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/wa/torbutton.properties b/src/chrome/locale/wa/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/wa/torbutton.properties
+++ b/src/chrome/locale/wa/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/wo/torbutton.dtd
+++ b/src/chrome/locale/wo/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/wo/torbutton.properties b/src/chrome/locale/wo/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/wo/torbutton.properties
+++ b/src/chrome/locale/wo/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index aa9a6da..94213d9 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -17,19 +17,19 @@
 <!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.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.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 "�身份">
+<!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 "æ??">
-<!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.key "P">
@@ -45,103 +45,107 @@
 <!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 æ?¶ç¦?止读å??å??å?²(é??è¦?)">
-<!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 æ?¶ç¦?ç?¨ç¡¬ç??ç¼?å­?并å?¨å??æ?¢æ?¶æ¸?é?¤ç¼?å­?">
-<!ENTITY torbutton.prefs.block_cache "使ç?¨ Tor æ?¶ç¦?止访é?®ç¡¬ç??ç¼?å­?å??å??å­?ç¼?å­?">
-<!ENTITY torbutton.prefs.cookie_jars "å?¨å??ä¿?æ?¤ç??jar中ä¿?å­?ä¸?ç?¨ Tor æ?¶ç??cookie">
+<!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 æ?¶ç¦?ç?¨ç£?ç??ç¼?å­?并æ¸?é?¤æ??æ??ç¼?å­?">
+<!ENTITY torbutton.prefs.block_cache "使ç?¨ Tor æ?¶ç¦?止访é?®ç£?ç??å??å??å­?ç¼?å­?">
+<!ENTITY torbutton.prefs.cookie_jars "å?¨å??ä¿?æ?¤ç?? jar 中ä¿?å­?é?? Tor ç?? Cookie">
 <!ENTITY torbutton.prefs.cookie_protection "请å?¨ Cookie é??ç§?ä¿?æ?¤å¯¹è¯?æ¡?å??é??æ?©">
-<!ENTITY torbutton.prefs.mmm_cookies "æ??è¦?è?ªå·±æ??å?¨ç®¡ç?? cookies (å?±é?©)">
+<!ENTITY torbutton.prefs.mmm_cookies "æ??è¦?æ??å?¨ç®¡ç??æ??ç?? cookies ï¼?å?±é?©ï¼?">
 <!ENTITY torbutton.prefs.clear_cookies "å??æ?¢ Tor æ?¶æ¸?é?¤ cookies">
-<!ENTITY torbutton.prefs.disable_plugins "使ç?¨ Tor æ?¶ç¦?ç?¨æ??件(é??è¦?)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook å?±é?©ç?? JavaScript (é??è¦?)">
-<!ENTITY torbutton.prefs.isolate_content "æ ¹æ?® Tor ç?¶æ??é??离å?¨æ??ç½?页å??容 (é??è¦?)">
+<!ENTITY torbutton.prefs.disable_plugins "使ç?¨ Tor æ?¶ç¦?ç?¨æ??件ï¼?é??è¦?ï¼?">
+<!ENTITY torbutton.prefs.kill_bad_js "æ??å?¾å?±é?©ç?? Java è??æ?¬ï¼?é??è¦?ï¼?">
+<!ENTITY torbutton.prefs.isolate_content "æ ¹æ?® Tor ç?¶æ??é??离å?¨æ??ç½?页å??容ï¼?(é??è¦?ï¼?">
 <!ENTITY torbutton.prefs.no_updates "使� Tor ��止�����">
-<!ENTITY torbutton.prefs.set_uagent "使ç?¨ Tor æ?¶ä¿®æ?¹ user-agent (é??è¦?)">
+<!ENTITY torbutton.prefs.set_uagent "使ç?¨ Tor ä½?为ç?¨æ?·ä»£ç??设置ï¼?é??è¦?ï¼?">
 <!ENTITY torbutton.prefs.dynamic "å?¨æ??ç½?页å??容">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "ç¼?å­?">
 <!ENTITY torbutton.prefs.history "å??å?²">
-<!ENTITY torbutton.prefs.no_search "使ç?¨ Tor æ?¶ç¦?ç?¨æ??索建议(æ?¨è??)">
+<!ENTITY torbutton.prefs.no_search "使ç?¨ Tor æ?¶ç¦?ç?¨æ??索建议ï¼?æ?¨è??ï¼?">
 <!ENTITY torbutton.prefs.shutdown "��">
-<!ENTITY torbutton.prefs.tor_shutdown "å¾? Tor å?³é?­æµ?è§?å?¨æ?¶æ¸?é?¤ç?¨ Tor æµ?è§?产ç??ç?? Cookies">
-<!ENTITY torbutton.prefs.all_shutdown "ä»»ä½?æ?¶å??å?³é?­æµ?è§?å?¨é?½æ¸?é?¤ cookies">
+<!ENTITY torbutton.prefs.tor_shutdown "é??è¿? Tor å?¯å?¨ç??æµ?è§?å?¨å?³é?­æ?¶æ¸?é?¤ Cookies">
+<!ENTITY torbutton.prefs.all_shutdown "任���������� cookies">
 <!ENTITY torbutton.prefs.no_shutdown "������ cookies">
-<!ENTITY torbutton.prefs.disable_sessionstore "ç¦?ç?¨ Firefox ç??ä¼?è¯?ä¿?å­?(æ?¨è??)">
+<!ENTITY torbutton.prefs.disable_sessionstore "ç¦?ç?¨ Firefox ç??ä¼?è¯?ä¿?å­?ï¼?æ?¨è??ï¼?">
 <!ENTITY torbutton.prefs.headers "Header">
 <!ENTITY torbutton.prefs.spoof_english "伪����语�为���语">
-<!ENTITY torbutton.prefs.refererspoofing "Referer 欺�">
+<!ENTITY torbutton.prefs.refererspoofing "伪� Referer">
 <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.smartspoof "使ç?¨ Tor æ?¶æ?ºè?½æ¬ºéª? Referer(欺éª?è·¨å?? Referer)">
+<!ENTITY torbutton.prefs.smartspoof "使ç?¨ Tor æ?¶ä¼ªé? æ?ºè?½ Refererï¼?伪é? è·¨å?? Refererï¼?">
 <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
-<!ENTITY torbutton.prefs.disable_domstorage "使ç?¨ Tor æ?¶ç¦?ç?¨æµ?è§?å?¨ç?? DOM å?¨å­?(é??è¦?)">
+<!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.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.non_tor "å??ç?¨ Tor">
+<!ENTITY torbutton.prefs.restore_tor "æ?¢å¤?æµ?è§?å?¨ä¼?è¯?æ?¶ï¼?设置 Tor ç??ç?¶æ??为ï¼?">
 <!ENTITY torbutton.prefs.startup_tor "æµ?è§?å?¨å?¯å?¨æ?¶,设置 Tor ç??ç?¶æ??为:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox å´©æº?å??é??è½½ cookie jar/æ¸?é?¤ cookie(æ?¨è??)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "å?¨å??ä¿?æ?¤ç?? jar æ??件中å??æ?¶ä¿?å­?使ç?¨ Tor å??ä¸?ç?¨ Tor æ?¶ç?? cookies(å?±é?©)">
-<!ENTITY torbutton.prefs.clear_http_auth "æ¸?é?¤ HTTP 认è¯?è¿?ç¨?(æ?¨è??)">
-<!ENTITY torbutton.prefs.block_js_history "Tor ç?¶æ??å??å??å??é??å?¶å?¨å??å??ç?¶æ??ä¸?å·²æµ?è§?ç??ç½?页é?´è¿?è¡?跳转 (é??è¦?)">
-<!ENTITY torbutton.prefs.resize_on_toggle "使ç?¨ Tor æ?¶è°?æ?´çª?å?£å¤§å°?为 50 å??ç´ ç??å??æ?°(æ?¨è??)">
-<!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 æ?¶ç?? SSL è¯?书å??å¼?å­?æ?¾(æ?¨è??)">
-<!ENTITY torbutton.prefs.jar_ca_certs "å°?使ç?¨ Tor/ä¸?ç?¨ Tor æ?¶ç?? CA è¯?书å??å¼?å­?æ?¾(æ?¨è??)">
-<!ENTITY torbutton.prefs.locked_mode "ç¦?ç?¨å·¥å?·æ ?æ??é?®ä¸?é?®ç??å¿«æ?·é?®é?²æ­¢è¯¯å??æ?¢">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox å´©æº?å?? é??è½½ cookie jar/æ¸?é?¤ cookieï¼?æ?¨è??ï¼?">
+<!ENTITY torbutton.prefs.dual_cookie_jars "å?¨å??ä¿?æ?¤ç?? jar æ??件中å??æ?¶ä¿?å­?使ç?¨ Tor å??å??ç?¨ Tor æ?¶ç?? cookiesï¼?å?±é?©ï¼?">
+<!ENTITY torbutton.prefs.clear_http_auth "æ¸?é?¤ HTTP 认è¯?ä¼?è¯?ï¼?æ?¨è??ï¼?">
+<!ENTITY torbutton.prefs.block_js_history "Tor ç?¶æ??å??å??å??é??å?¶å?¨å??å??ç?¶æ??ä¸?å·²æµ?è§?ç??ç½?页é?´è¿?è¡?跳转 ï¼?é??è¦?ï¼?">
+<!ENTITY torbutton.prefs.resize_on_toggle "使ç?¨ Tor æ?¶è°?æ?´çª?å?£å¤§å°?为 50 å??ç´ ç??å??æ?°ï¼?æ?¨è??ï¼?">
+<!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 æ?¶ç?? SSL è¯?书å??å¼?å­?æ?¾ï¼?æ?¨è??ï¼?">
+<!ENTITY torbutton.prefs.jar_ca_certs "å°?使ç?¨ Tor/å??ç?¨ Tor æ?¶ç?? 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://)使ç?¨ Tor 访é?®ç½?ç»?(æ?¨è??)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "�止����(file://)�� Tor 访���">
+<!ENTITY torbutton.prefs.block_tor_file_net "ç¦?æ­¢æ?¬å?°é?¾æ?¥ï¼?file://ï¼?使ç?¨ Tor 访é?®ç½?ç»?ï¼?æ?¨è??ï¼?">
+<!ENTITY torbutton.prefs.block_nontor_file_net "�止�����file://��� Tor 访���">
 <!ENTITY torbutton.prefs.restore_defaults "���认设置">
 <!ENTITY torbutton.prefs.test_settings "æµ?è¯?代ç??设置">
-<!ENTITY torbutton.prefs.test_auto "æ¯?次å?¯å?¨ Firefox å??å?¨ç¬¬ä¸?次å??æ?¢ Tor æ?¶è?ªå?¨éª?è¯? Tor 设置">
+<!ENTITY torbutton.prefs.test_auto "æ¯?次å?¯å?¨ Firefox å??è¿?è¡?é¦?次å??æ?¢æ?¶è?ªå?¨éª?è¯? Tor 设置">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "使ç?¨ Tor æµ?è§?æ?¶ä¸?è¦?å°? Cookie å­?å?¥ç£?ç??">
-<!ENTITY torbutton.prefs.nontor_memory_jar "ä¸?ç?¨ Tor æµ?è§?æ?¶ä¸?è¦?å°? Cookie å­?å?¥ç£?ç??">
+<!ENTITY torbutton.prefs.tor_memory_jar "使ç?¨ Tor æ?¶ä¸?å°? Cookie å??å?¥ç£?ç??">
+<!ENTITY torbutton.prefs.nontor_memory_jar "å??ç?¨ Tor æ?¶ä¸?å°? Cookie å??å?¥ç£?ç??">
 <!ENTITY torbutton.prefs.session_restore "让 Firefox ç??ä¼?è¯?ä¿?å­?å??è?½ä¿?å­?并æ?¢å¤?å¦?ä¸?æ ?签页ï¼?">
-<!ENTITY torbutton.prefs.nontor_tabs "ä¸?使ç?¨ Tor ç??æ ?签页">
-<!ENTITY torbutton.prefs.tor_tabs "使ç?¨ Tor ç??æ ?签页">
+<!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 "ä¸?使ç?¨ä»£ç??ç??å?°å??:">
 <!ENTITY torbutton.prefs.no_proxy_warning "è­¦å??ï¼?请ä¸?è¦?使ç?¨ä¸?è¿°ä»»ä½?主æ?ºå??ã??">
-<!ENTITY torbutton.prefs.spoofreresh "�干�页�����">
-<!ENTITY torbutton.prefs.refereroptions "Referer 欺éª? é??项">
-<!ENTITY torbutton.prefs.nospoof "�干� Referer">
-<!ENTITY torbutton.prefs.spoofroot "å??é??页é?¢ç??å½?å??è·¯å¾?ä½?为 Referer">
-<!ENTITY torbutton.prefs.spoofdomain "å??é??主å??å??ä½?为 Referer">
-<!ENTITY torbutton.prefs.spoofblank "�空 Referer">
+<!ENTITY torbutton.prefs.spoofreresh "伪���">
+<!ENTITY torbutton.prefs.refereroptions "Referer 欺éª?é??项">
+<!ENTITY torbutton.prefs.nospoof "正常 Referer">
+<!ENTITY torbutton.prefs.spoofroot "伪é? å??å?«æ??件夹ç??页é?¢">
+<!ENTITY torbutton.prefs.spoofdomain "伪é? å??å??ä½?为 Referer">
+<!ENTITY torbutton.prefs.spoofblank "��空� Referer">
 <!ENTITY torbutton.cookiedialog.title "管ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?æ?¤">
 <!ENTITY torbutton.cookiedialog.domainCol "æ??å?¡å?¨">
 <!ENTITY torbutton.cookiedialog.nameCol "å??称">
 <!ENTITY torbutton.cookiedialog.pathCol "路�">
 <!ENTITY torbutton.cookiedialog.protectCookie "ä¿?æ?¤ Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "移 �Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "移� Cookie">
 <!ENTITY torbutton.cookiedialog.unprotectCookie "å??æ­¢ä¿?æ?¤ Cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "ä»?ä¿?ç??å??ä¿?æ?¤ç?? Cookieï¼?å?¶ä»?移é?¤å?¨é?¨">
+<!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨ç§»é?¤ä»?ä¿?ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?æ?¤æ?°ç?? Cookies">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?æ?¤æ?°ç??">
-<!ENTITY torbutton.prefs.disable_livemarks "使� Tor ��� Livemark ��(RSS 书签)">
-<!ENTITY torbutton.prefs.dtd_recommended "(æ?¨è??)">
-<!ENTITY torbutton.prefs.dtd_optional "(å?¯é??)">
-<!ENTITY torbutton.prefs.dtd_crucial "(é??è¦?)">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?æ?¤æ?°ç?? Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "使� Tor ��� Livemark ���RSS 书签�">
+<!ENTITY torbutton.prefs.dtd_recommended "ï¼?æ?¨è??ï¼?">
+<!ENTITY torbutton.prefs.dtd_optional "ï¼?å?¯é??ï¼?">
+<!ENTITY torbutton.prefs.dtd_crucial "ï¼?é??è¦?ï¼?">
 <!ENTITY torbutton.prefs.update_torbutton_via_tor "é??è¿? Tor é??å®?å?? Torbutton ç??æ?´æ?°">
-<!ENTITY torbutton.prefs.dodge_google_captcha "å½?æ?¾ç¤º Google Captcha æ?¶ï¼?è?ªå?¨è°?ç?¨å??é??æ??ç´¢å¼?æ??">
+<!ENTITY torbutton.prefs.dodge_google_captcha "å½?æ??示é??è¦? Google éª?è¯?ç ?æ?¶è?ªå?¨è°?ç?¨å¤?ç?¨æ??ç´¢å¼?æ??ï¼?">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "å?¨ Google æ??ç´¢æ ?æ??ç´¢æ?¶å??å?²å¹³å?°å??语è¨?ä¿¡æ?¯ã??">
-<!ENTITY torbutton.prefs.transparentTor "Tor é??æ??代ç??(é??è¦?è?ªè®¾é??æ??代ç??æ??Torè·¯ç?±ç¨?åº?ç??æ?¯æ??)">
+<!ENTITY torbutton.prefs.transparentTor "Tor 强å??é??æ??代ç??ï¼?é??è¦?è?ªè®¾ TransProxy æ?? Tor è·¯ç?±ï¼?">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index ae66072..9dd079e 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -6,7 +6,7 @@ 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 ä½?为代ç??ã??
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton å±?è?½äº?å?¨å?¶ä»? Tor ç?¶æ??ä¸?å? è½½ç??æ ?ç­¾ç??æ´»å?¨ã??\n\nè¿?æ?¯ç?¨äº?æ??æ?¶è§£å?³ Firefox Bug 409737 å?? 417869ã??\nå¦?æ??è¿?个弹å?ºçª?å?£å?¨æ?¨ä¸?ç?¥æ??ç??æ??å?µä¸?å¼¹å?ºï¼?å??æ?¨ç??æ ?ç­¾ä¹?ä¸?æ­£è¯?å?¾å?¨å??å?°é??æ?°è½½å?¥è?ªå·±ï¼?ç?¶è??è¿?æ ·ç??è¡?为æ?¯è¢«å±?è?½ç??ã??\n\nè¦?å?·æ?°å½?å?? Tor ç?¶æ??ä¸?ç??æ ?ç­¾ï¼?å°?ç?¦ç?¹ç½®äº?å?¨å?°å??æ ?并æ??å??车é?®ã??\n\n
 torbutton.popup.plugin.warning = Torbutton é?»æ­¢äº?æµ?è§?å?¨æ?´ Tor æ?¶ç?´æ?¥å? è½½é??è¦?æ??件æ?¯æ??ç??å??容ã??\n\n请使ç?¨â??å?¦å­?为â??(ä¿?å­?å??æµ?è§?)ã??\n\n
 torbutton.popup.confirm_ca_certs = Torbutton 注æ??ï¼?æµ?è§?å?¨ä¼¼ä¹?缺å°?è?ªå®?ä¹?ç??CA(è¯?书é¢?å??æ?ºæ??)ã??æ£?æ?¥CAå??表æ?¯ä¸?项è??æ?¶ç??æ??ä½?ï¼?é??ç¢?Torç??å??æ?¢ã??æ?¨æ?¯å?¦å¸?æ??ç¦?ç?¨å¯¹CAè¯?书ç??é??离ï¼?)å¦?æ??æ?¨ä¸?æ??ï¼?å?¯ä»¥é??æ?©â??ç¡®å®?â??)
@@ -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 å??ç??ç³»ç»?æ?? Torsocksã??\n
 torbutton.popup.launch = ����
 torbutton.popup.cancel = å??æ¶?
 torbutton.popup.dontask = æ­¤å??æ?»æ?¯å?¯å?¨ç¨?åº?
@@ -34,19 +34,19 @@ torbutton.popup.captcha.ask = Torbutton �����个 Google Captcha��
 torbutton.popup.captcha.always = æ­¤å??æ?»æ?¯ä½¿ç?¨æ­¤æ??ä½?
 torbutton.popup.redirect = é??å®?å??
 torbutton.popup.no_redirect = ä¸?è¦?é??å®?å??
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = 为äº?æ?´å¥½å?°ä¿?æ?¤æ?¨ç??é??ç§?ï¼? Torbutton å?¯ä»¥è¯·æ±?ç½?页ç??è?±è¯­ç??æ?¬ã??è¿?å?¯è?½å¯¼è?´æ?¨å¸?æ??æµ?è§?ç??æ?¬å??语è¨?ç??ç½?页以è?±è¯­æ?¾ç¤ºã??\n\næ?¨è¦?为äº?æ?´å¥½å?°ä¿?æ?¤é??ç§?ï¼?以è?±è¯­è¯­è¨?请æ±?ç½?页å??ï¼?
+torbutton.popup.no_newnym = Torbutton æ? æ³?å®?å?¨å?°ä¸ºæ?¨å??æ?¢ä¸?个æ?°èº«ä»½ã??å®?æ? æ³?访é?® Tor ç??æ?§å?¶ç«¯å?£ã??\n\næ?¨ç?®å??æ­£å?¨ä½¿ç?¨ Tor æµ?è§?å?¨å¥?件å??ï¼?
+torbutton.popup.use_tbb = æ?¨ä¼¼ä¹?æ­£å?¨ Firefox 中使ç?¨ Torbuttonï¼?è??æ??们ä¸?å??æ?¨è??æ­¤é??ç½®ã??\n\næ??们æ?¨è??æ?¨ä½¿ç?¨æ??æ?°ç?? Tor æµ?è§?å?¨å¥?件ï¼?æ?¨å?¯ä»¥å??ç?µé?®ç»? gettor@xxxxxxxxxxxxxx è?·å¾?æ­¤å¥?件æ??ä»?å¦?ä¸?é?¾æ?¥ä¸?è½½ï¼?
+torbutton.popup.pref_error = Torbutton æ? æ³?æ?´æ?° Tor æµ?è§?å?¨é??ç½®ç?®å½?中ç??é??ç½®ã??
+torbutton.popup.permission_denied = 请é??ç½® Tor æµ?è§?å?¨ç?®å½?ç??æ??件æ??é??æ??å°?å?¶å¤?å?¶å?°ä¸?个æ?°ä½?ç½®ã??
+torbutton.popup.device_full = 硬ç??空é?´å·²æ»¡ã??请é??æ?¾ä¸?äº?空é?´æ??å°? Tor æµ?è§?å?¨ç§»å?¨è?³å?¶ä»?æ?°è®¾å¤?ã??
 torbutton.title.prompt_torbrowser = é??è¦?ç??Torbuttonç??ä¿¡æ?¯
-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.prompt_torbrowser = Torbutton å·¥ä½?æ?¹å¼?æ??æ??æ?¹å??ï¼?å®?ä¸?å??æ?¯æ??临æ?¶å?³é?­ã??\n\nå??å?ºè¿?ç§?æ?¹å??æ?¯å? ä¸ºå?¨é??å?¿å??æµ?è§?ç??æµ?è§?å?¨ä¸­ï¼?å??æ?¶ä½¿ç?¨ Torbutton 并ä¸?å®?å?¨ã??æ??太å¤?æ? æ³?å??æ??ç??é??误ã??\n\nå¦?æ??æ?¨å¸?æ??正常使ç?¨ Firefox ï¼?请å?¸è½½ Torbutton æ??件ï¼?ä¸?è½½ Tor æµ?è§?å?¨å¥?件ã??Tor æµ?è§?å?¨ç??é??ç§?ç?¹æ?§ä¼?äº?æ?®é??ç?? Firefox ï¼?å?³ä½¿Firefox中使ç?¨äº?Torbuttonã??\n\n移é?¤ Torbuttonï¼?请å?° å·¥å?·Tools->é??å? ç»?件Addons->æ?©å±?Extensions 中ï¼?å?¨ Torbutton æ??ç?¹å?»å?¸è½½ã??
 torbutton.popup.short_torbrowser = Torbuttonç??é??è¦?ä¿¡æ?¯\n\nTorbuttonç??æ?¯ç?¾å?¨å§?çµ?è??æ?¼å??ç?¨ç??æ??\n\né»?æ??Torbuttonç??æ?´å¤?ä¿¡æ?¯
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=æ­¤ç½?ç«?(%S)è¯?å?¾è®¿é?®ç?»å¸?ä¸?ç??å?¾å??æ?°æ?®ã??å? ä¸ºç?»å¸?ä¸?ç??æ?°æ?®å?¯ä»¥è¢«ç?¨æ?¥ä¾¦æµ?æ?¨ç??ç?µè??ä¿¡æ?¯ï¼?æ??以 Torbutton è¿?次è¿?å??äº?空ç?½å?¾å??æ?°æ?®ã??
+canvas.allow=以å??å??许
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=�止此��
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/zh-HK/torbutton.properties b/src/chrome/locale/zh-HK/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/zh-HK/torbutton.properties
+++ b/src/chrome/locale/zh-HK/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 36a5dc3..b923b66 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index 908b6cc..2cd7415 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -6,7 +6,7 @@ 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 ç??æ??é??
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd
index 01fa8f1..cfd014c 100644
--- a/src/chrome/locale/zu/torbutton.dtd
+++ b/src/chrome/locale/zu/torbutton.dtd
@@ -145,3 +145,7 @@
 <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/zu/torbutton.properties b/src/chrome/locale/zu/torbutton.properties
index 875240e..f4a8036 100644
--- a/src/chrome/locale/zu/torbutton.properties
+++ b/src/chrome/locale/zu/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)



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