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

14 Feb 2013

commit 5c0df1fb787841f0fc24f9064c745eaf22d8b9f3
Author: Mike Perry <mikeperry-git@fscked.org>
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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org 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@torproject.org 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-torbutton.title.prompt_torbrowser = Important Torbutton Information
-torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+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@torproject.org 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org 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@torproject.org 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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@torproject.org or by downloading it at the following URL: 
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.popup.prompted_language = äžºäºæŽå¥œå°ä¿æ€æšçéç§ïŒ Torbutton å¯ä»¥è¯·æ±çœé¡µçè±è¯çæ¬ãè¿å¯èœå¯ŒèŽæšåžææµè§çæ¬åè¯èšççœé¡µä»¥è±è¯æŸç€ºã\n\næšèŠäžºäºæŽå¥œå°ä¿æ€éç§ïŒä»¥è±è¯è¯èšè¯·æ±çœé¡µåïŒ
+torbutton.popup.no_newnym = Torbutton æ æ³å®åšå°äžºæšåæ¢äžäžªæ°èº«ä»œãå®æ æ³è®¿é® Tor çæ§å¶ç«¯å£ã\n\næšç®åæ£åšäœ¿çš Tor æµè§åšå¥ä»¶åïŒ
+torbutton.popup.use_tbb = æšäŒŒä¹æ£åš Firefox äžäœ¿çš TorbuttonïŒèæä»¬äžåæšèæ€éçœ®ã\n\næä»¬æšèæšäœ¿çšææ°ç Tor æµè§åšå¥ä»¶ïŒæšå¯ä»¥åçµé®ç» gettor@torproject.org è·åŸæ€å¥ä»¶æä»åŠäžéŸæ¥äžèœœïŒ
+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@torproject.org.description = 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@torproject.org.description = 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@torproject.org.description = 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] [torbutton/master] Move new strings to all locales.

mikeperry＠torproject.org