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

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
From: translation@xxxxxxxxxxxxxx
Date: Tue, 27 Sep 2016 08:47:59 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 27 Sep 2016 04:48:32 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 71a584baa7f90081e6b675522a3733a66f462454
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Tue Sep 27 08:47:56 2016 +0000

    Update translations for torbutton-torbuttondtd
---
 ach/torbutton.dtd         | 8 ++++++--
 ady/torbutton.dtd         | 8 ++++++--
 af/torbutton.dtd          | 8 ++++++--
 ak/torbutton.dtd          | 8 ++++++--
 am/torbutton.dtd          | 8 ++++++--
 ar/torbutton.dtd          | 8 ++++++--
 arn/torbutton.dtd         | 8 ++++++--
 ast/torbutton.dtd         | 8 ++++++--
 az/torbutton.dtd          | 8 ++++++--
 ba/torbutton.dtd          | 8 ++++++--
 be/torbutton.dtd          | 8 ++++++--
 bg/torbutton.dtd          | 8 ++++++--
 bn/torbutton.dtd          | 8 ++++++--
 bn_BD/torbutton.dtd       | 8 ++++++--
 bn_IN/torbutton.dtd       | 8 ++++++--
 bo/torbutton.dtd          | 8 ++++++--
 br/torbutton.dtd          | 8 ++++++--
 brx/torbutton.dtd         | 8 ++++++--
 bs/torbutton.dtd          | 8 ++++++--
 ca/torbutton.dtd          | 8 ++++++--
 ceb/torbutton.dtd         | 8 ++++++--
 cs/torbutton.dtd          | 8 ++++++--
 csb/torbutton.dtd         | 8 ++++++--
 cv/torbutton.dtd          | 8 ++++++--
 cy/torbutton.dtd          | 8 ++++++--
 da/torbutton.dtd          | 8 ++++++--
 de/torbutton.dtd          | 8 ++++++--
 dz/torbutton.dtd          | 8 ++++++--
 el/torbutton.dtd          | 8 ++++++--
 en/torbutton.dtd          | 8 ++++++--
 en_GB/torbutton.dtd       | 8 ++++++--
 eo/torbutton.dtd          | 8 ++++++--
 es/torbutton.dtd          | 8 ++++++--
 es_AR/torbutton.dtd       | 8 ++++++--
 es_CL/torbutton.dtd       | 8 ++++++--
 es_CO/torbutton.dtd       | 8 ++++++--
 es_MX/torbutton.dtd       | 8 ++++++--
 et/torbutton.dtd          | 8 ++++++--
 eu/torbutton.dtd          | 8 ++++++--
 fa/torbutton.dtd          | 8 ++++++--
 fi/torbutton.dtd          | 8 ++++++--
 fil/torbutton.dtd         | 8 ++++++--
 fo/torbutton.dtd          | 8 ++++++--
 fr/torbutton.dtd          | 8 ++++++--
 fr_CA/torbutton.dtd       | 8 ++++++--
 fur/torbutton.dtd         | 8 ++++++--
 fy/torbutton.dtd          | 8 ++++++--
 ga/torbutton.dtd          | 8 ++++++--
 gd/torbutton.dtd          | 8 ++++++--
 gl/torbutton.dtd          | 8 ++++++--
 gu/torbutton.dtd          | 8 ++++++--
 gu_IN/torbutton.dtd       | 8 ++++++--
 gun/torbutton.dtd         | 8 ++++++--
 ha/torbutton.dtd          | 8 ++++++--
 he/torbutton.dtd          | 8 ++++++--
 hi/torbutton.dtd          | 8 ++++++--
 hr/torbutton.dtd          | 8 ++++++--
 hr_HR/torbutton.dtd       | 8 ++++++--
 ht/torbutton.dtd          | 8 ++++++--
 hu/torbutton.dtd          | 8 ++++++--
 hy/torbutton.dtd          | 8 ++++++--
 ia/torbutton.dtd          | 8 ++++++--
 id/torbutton.dtd          | 8 ++++++--
 is/torbutton.dtd          | 8 ++++++--
 it/torbutton.dtd          | 8 ++++++--
 ja/torbutton.dtd          | 8 ++++++--
 jv/torbutton.dtd          | 8 ++++++--
 ka/torbutton.dtd          | 8 ++++++--
 kk/torbutton.dtd          | 8 ++++++--
 km/torbutton.dtd          | 8 ++++++--
 kn/torbutton.dtd          | 8 ++++++--
 ko/torbutton.dtd          | 8 ++++++--
 ko_KR/torbutton.dtd       | 8 ++++++--
 ku/torbutton.dtd          | 8 ++++++--
 ku_IQ/torbutton.dtd       | 8 ++++++--
 kw/torbutton.dtd          | 8 ++++++--
 ky/torbutton.dtd          | 8 ++++++--
 la/torbutton.dtd          | 8 ++++++--
 lb/torbutton.dtd          | 8 ++++++--
 lg/torbutton.dtd          | 8 ++++++--
 ln/torbutton.dtd          | 8 ++++++--
 lo/torbutton.dtd          | 8 ++++++--
 lt/torbutton.dtd          | 8 ++++++--
 lv/torbutton.dtd          | 8 ++++++--
 mg/torbutton.dtd          | 8 ++++++--
 mi/torbutton.dtd          | 8 ++++++--
 mk/torbutton.dtd          | 8 ++++++--
 ml/torbutton.dtd          | 8 ++++++--
 mn/torbutton.dtd          | 8 ++++++--
 mr/torbutton.dtd          | 8 ++++++--
 ms_MY/torbutton.dtd       | 8 ++++++--
 mt/torbutton.dtd          | 8 ++++++--
 my/torbutton.dtd          | 8 ++++++--
 nah/torbutton.dtd         | 8 ++++++--
 nap/torbutton.dtd         | 8 ++++++--
 nb/torbutton.dtd          | 8 ++++++--
 nds/torbutton.dtd         | 8 ++++++--
 ne/torbutton.dtd          | 8 ++++++--
 nl/torbutton.dtd          | 8 ++++++--
 nl_BE/torbutton.dtd       | 8 ++++++--
 nn/torbutton.dtd          | 8 ++++++--
 nso/torbutton.dtd         | 8 ++++++--
 oc/torbutton.dtd          | 8 ++++++--
 om/torbutton.dtd          | 8 ++++++--
 or/torbutton.dtd          | 8 ++++++--
 pa/torbutton.dtd          | 8 ++++++--
 pap/torbutton.dtd         | 8 ++++++--
 pl/torbutton.dtd          | 8 ++++++--
 pms/torbutton.dtd         | 8 ++++++--
 ps/torbutton.dtd          | 8 ++++++--
 pt/torbutton.dtd          | 8 ++++++--
 pt_BR/torbutton.dtd       | 8 ++++++--
 ro/torbutton.dtd          | 8 ++++++--
 ru/torbutton.dtd          | 8 ++++++--
 ru@petr1708/torbutton.dtd | 8 ++++++--
 scn/torbutton.dtd         | 8 ++++++--
 sco/torbutton.dtd         | 8 ++++++--
 si_LK/torbutton.dtd       | 8 ++++++--
 sk/torbutton.dtd          | 8 ++++++--
 sk_SK/torbutton.dtd       | 8 ++++++--
 sl/torbutton.dtd          | 8 ++++++--
 sl_SI/torbutton.dtd       | 8 ++++++--
 sn/torbutton.dtd          | 8 ++++++--
 so/torbutton.dtd          | 8 ++++++--
 son/torbutton.dtd         | 8 ++++++--
 sq/torbutton.dtd          | 8 ++++++--
 sr/torbutton.dtd          | 8 ++++++--
 sr@latin/torbutton.dtd    | 8 ++++++--
 st/torbutton.dtd          | 8 ++++++--
 su/torbutton.dtd          | 8 ++++++--
 sv/torbutton.dtd          | 8 ++++++--
 sw/torbutton.dtd          | 8 ++++++--
 szl/torbutton.dtd         | 8 ++++++--
 ta/torbutton.dtd          | 8 ++++++--
 te/torbutton.dtd          | 8 ++++++--
 te_IN/torbutton.dtd       | 8 ++++++--
 tg/torbutton.dtd          | 8 ++++++--
 th/torbutton.dtd          | 8 ++++++--
 ti/torbutton.dtd          | 8 ++++++--
 tk/torbutton.dtd          | 8 ++++++--
 tr/torbutton.dtd          | 8 ++++++--
 tzm/torbutton.dtd         | 8 ++++++--
 ug@Arab/torbutton.dtd     | 8 ++++++--
 uk/torbutton.dtd          | 8 ++++++--
 ur/torbutton.dtd          | 8 ++++++--
 ur_PK/torbutton.dtd       | 8 ++++++--
 uz/torbutton.dtd          | 8 ++++++--
 ve/torbutton.dtd          | 8 ++++++--
 vi/torbutton.dtd          | 8 ++++++--
 wa/torbutton.dtd          | 8 ++++++--
 wo/torbutton.dtd          | 8 ++++++--
 zh_CN/torbutton.dtd       | 8 ++++++--
 zh_HK/torbutton.dtd       | 8 ++++++--
 zh_TW/torbutton.dtd       | 8 ++++++--
 zu/torbutton.dtd          | 8 ++++++--
 155 files changed, 930 insertions(+), 310 deletions(-)

diff --git a/ach/torbutton.dtd b/ach/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ach/torbutton.dtd
+++ b/ach/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ady/torbutton.dtd b/ady/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ady/torbutton.dtd
+++ b/ady/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/af/torbutton.dtd b/af/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/af/torbutton.dtd
+++ b/af/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ak/torbutton.dtd b/ak/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ak/torbutton.dtd
+++ b/ak/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/am/torbutton.dtd b/am/torbutton.dtd
index 5266288..0b68d4e 100644
--- a/am/torbutton.dtd
+++ b/am/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á? á?²á?µ á?©á?ªá??á?½á?? á? á?¥á??">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á? á?²á?µ á?©á?ªá??á?½á?? á? á?µá? á?¥á??">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "á?¨á? á?°á?³ á?³á?ªá?á?? á??á?á?? á?¨á?µá? á?£á?¢á?« á??á??á?¥á?? á? á?µá??á??á??á?¥ (á?¨á??á?? á? á?°á?³ á??á??á?³á?? á?«á??á??á??)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "á?¨á?¶á?µá?°á?? á??á??á?? á?©á?ªá??á?½á?? á?¥á?? á??á??á?½ á??á?¨á?³á?°á?« á??á??á?¥á?? á??á?µá?¥">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "á?¨á? á?³á?½ á?°á?°á?ªá??á?½á?? (á?¥á??á?° Flash á?«á??) á? á?°á??á?á??">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "á?¥á?á?µá??á?? á?¨á??á??á?½ á?¨Tor á? á?³á?½ á?°á? á??á??á??á?½ á?¨á??á??á?© á??á?á??á?®á?½á?? á?á??á?á?©">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ar/torbutton.dtd b/ar/torbutton.dtd
index 5d0bac4..5a9998f 100644
--- a/ar/torbutton.dtd
+++ b/ar/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ø§ØÙ? Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø· Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ù?Ø§ ØªØÙ? Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø· Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©">
 <!ENTITY torbutton.prefs.priv_caption "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø®ØµÙ?ØµÙ?Ø©">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ù?Ø§ ØªØ³Ø¬Ù? Ø³Ø¬Ù? Ø§Ù?ØªØµÙ?Ø Ø£Ù? Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ø£Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© (ØªÙ?Ø¹Ù?Ù? Ø§Ù?ØªØµÙ?Ø Ø§Ù?Ø®ØµÙ?ØµÙ?)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ØªÙ?Ù?Ù?Ø¯ Ø§Ù?Ù?Cookies Ø§Ù?Ø®Ø§ØµØ© Ø¨Ø§Ù?Ø·Ø±Ù? Ø§Ù?Ø«Ø§Ù?Ø« Ù? Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?ØªØªØ¨Ø¹ Ø§Ù?Ø£Ø®Ø±Ù?.">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "ØªØ¹Ø·Ù?Ù? Ø¥Ø¶Ø§Ù?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø (Ù?Ø«Ù? Ù?Ù?Ø§Ø´)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ØªØºÙ?Ù?Ø± Ø§Ù?ØªÙ?Ø§ØµÙ?Ù? Ø§Ù?ØªÙ? ØªÙ?Ù?Ø²Ù? Ø¹Ù? Ø§Ù?Ù?Ø³ØªØ®Ø¯Ù?Ù?Ù? Ø§Ù?Ø¢Ø®Ø±Ù?Ù? Ù?Ù?ØªØµÙ?Ø ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ù?Ø³ØªÙ?Ù? Ø§Ù?Ø£Ù?Ø§Ù?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Ù?Ù?Ø®Ù?Ø¶ (Ø§Ù?ØªØ±Ø§Ø¶Ù?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ù?Ø°Ø§ Ù?Ù?Ù?Ø± Ø£Ù?Ø¶Ù? Ø®Ø¨Ø±Ø© Ù?Ù?Ø¥Ø³ØªØ®Ø¯Ø§Ù?">
 <!ENTITY torbutton.prefs.sec_low_desc "Ø·Ø¨Ù?Ø§Ù? Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ø³ØªÙ?Ù? Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø£Ù?Ø§Ù? Ø³Ù?Ù? Ù?ØªÙ? ØªÙ?Ø¹Ù?Ù? Ù?Ù? ØµÙ?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Ø³Ù?Ø±Ø¨Øª Ù?Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ù?Ø¯ ØªØ¹Ù?Ù? Ø¨Ø´Ù?Ù? Ø¨Ø·Ù?Ø¦">
-<!ENTITY torbutton.prefs.sec_jar_desc "Ù?ØªÙ? ØØ¸Ø± Ù?Ù?Ù?Ø§Øª JAR Ø§Ù?Ù?Ø§Ø¦Ù?Ø©.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Ù?Ù?Ù?Ø§Øª JAR Ù?Ø§Ø¯Ø±Ø© Ù?Ù?ØºØ§Ù?Ø© Ø¹Ù?Ù? Ø´Ø¨Ù?Ø© Ø§Ù?Ø¥Ù?ØªØ±Ù?ØªØ? Ù?Ù?Ù?Ù? Ù?Ù?Ù?Ù? Ø£Ù? ØªÙ?Ù?Ù? Ù?ØµØ¯Ø±Ø§ Ù?Ù?XSS Ù?ØºÙ?Ø±Ù?Ø§ Ù?Ù? Ø§Ù?Ù?Ø¬Ù?Ø§Øª.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Ø¨Ø¹Ø¶ Ø§Ù?Ø¢Ù?Ù?Ø§Øª Ù?Ø¹Ø±Ø¶ Ù?Ø¹Ø§Ø¯Ù?Ø§Øª Ø±Ù?Ø§Ø¶Ù?Ø© Ù?Ø¹Ø·Ù?Ø©.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Ø´Ø¨Ù? Ø¹Ø§Ù?Ù?">
diff --git a/arn/torbutton.dtd b/arn/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/arn/torbutton.dtd
+++ b/arn/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ast/torbutton.dtd b/ast/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ast/torbutton.dtd
+++ b/ast/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/az/torbutton.dtd b/az/torbutton.dtd
index bf8c18c..462221d 100644
--- a/az/torbutton.dtd
+++ b/az/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Å?É?xsilik seÃ§imlÉ?ri">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "TÉ?hlÃ¼kÉ?sizlik sÉ?viyyÉ?si">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "ZÉ?if(cari)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Orta-yÃ¼ksÉ?k">
diff --git a/ba/torbutton.dtd b/ba/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ba/torbutton.dtd
+++ b/ba/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/be/torbutton.dtd b/be/torbutton.dtd
index 04da6fc..a700d9c 100644
--- a/be/torbutton.dtd
+++ b/be/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/bg/torbutton.dtd b/bg/torbutton.dtd
index a72e1c2..9354483 100644
--- a/bg/torbutton.dtd
+++ b/bg/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Ð?Ð¸Ñ?Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ð?Ð¸Ð²Ð¾ Ð½Ð° Ð·Ð°Ñ?Ð¸Ñ?Ð°">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Ð?Ð¸Ñ?ÐºÐ¾ (Ð¿Ð¾ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ð¢Ð¾Ð²Ð° Ð¾Ñ?Ð¸Ð³Ñ?Ñ?Ñ?Ð²Ð° Ð½Ð°Ð¹-Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°ÐµÐ¼Ð¸Ñ? Ð¾Ð¿Ð¸Ñ?.">
 <!ENTITY torbutton.prefs.sec_low_desc "Ð?Ð° Ñ?Ð¾Ð²Ð° Ð½Ð¸Ð²Ð¾ Ð½Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?, Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð½Ð° Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð° Ñ?Ð° Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ð°Ð½Ð¸.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT ÐºÐ¾Ð¼Ð¿Ð¸Ð»Ð°Ñ?Ð¾Ñ?.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Ð¡ÐºÑ?Ð¸Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½Ð° Ð½Ñ?ÐºÐ¾Ð¸ Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ñ? Ð¿Ð¾-Ð±Ð°Ð²Ð½Ð¾.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Ð?Ñ?Ð´Ð°Ð»ÐµÑ?ÐµÐ½Ð¸ JAR Ñ?Ð°Ð¹Ð»Ð¾Ð²Ðµ Ñ?Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½Ð¸.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR Ñ?Ð°Ð¹Ð»Ð¾Ð²ÐµÑ?Ðµ Ñ?Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¾ Ñ?ÐµÐ´ÐºÐ¸ Ð² Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°, Ð½Ð¾ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð±Ñ?Ð´Ð°Ñ? Ð¸Ð·Ñ?Ð¾Ñ?Ð½Ð¸Ðº Ð½Ð° XSS Ð¸ Ð´Ñ?Ñ?Ð³Ð¸ Ð°Ñ?Ð°ÐºÐ¸.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Ð?Ñ?ÐºÐ¾Ð¸ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¼Ð°Ñ?ÐµÐ¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ñ?Ñ?Ð°Ð²Ð½ÐµÐ½Ð¸Ñ? Ñ?Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ðµ Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½.">
 <!ENTITY torbutton.prefs.sec_med_high "Ð¡Ñ?ÐµÐ´Ð½Ð¾-Ð²Ð¸Ñ?Ð¾ÐºÐ¾">
diff --git a/bn/torbutton.dtd b/bn/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/bn/torbutton.dtd
+++ b/bn/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/bn_BD/torbutton.dtd b/bn_BD/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/bn_BD/torbutton.dtd
+++ b/bn_BD/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/bn_IN/torbutton.dtd b/bn_IN/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/bn_IN/torbutton.dtd
+++ b/bn_IN/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/bo/torbutton.dtd b/bo/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/bo/torbutton.dtd
+++ b/bo/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/br/torbutton.dtd b/br/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/br/torbutton.dtd
+++ b/br/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/brx/torbutton.dtd b/brx/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/brx/torbutton.dtd
+++ b/brx/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/bs/torbutton.dtd b/bs/torbutton.dtd
index 9226d28..ebdc48c 100644
--- a/bs/torbutton.dtd
+++ b/bs/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "PodeÅ¡avanja privatnosti">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ca/torbutton.dtd b/ca/torbutton.dtd
index 070c66a..28e0b5f 100644
--- a/ca/torbutton.dtd
+++ b/ca/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "PreferÃ¨ncies de privadesa">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Nivell de seguretat">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Baix (per defecte)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "AixÃ² proporciona l'experiÃ¨ncia mÃ©s usable.">
 <!ENTITY torbutton.prefs.sec_low_desc "En aquest nivell de seguretat, totes les caracterÃstiques del navegador estan activades. ">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, InferÃ¨ncia de Tipus, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Punt de referÃ¨ncia JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Els Scripts d'alguns llocs poden funcionar mÃ©s lentament. ">
-<!ENTITY torbutton.prefs.sec_jar_desc "Els fitxers remots JAR estan bloquejats. ">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Els fitxers JAR sÃ³n molt rars a la web, perÃ² poden ser una fon de XSS i altres atacs. ">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismes que mostren equacions matemÃ tiques estan desactivats.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "El MathML estÃ  desactivat. ">
 <!ENTITY torbutton.prefs.sec_med_high "MitjÃ -alt">
diff --git a/ceb/torbutton.dtd b/ceb/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ceb/torbutton.dtd
+++ b/ceb/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/cs/torbutton.dtd b/cs/torbutton.dtd
index 3bf5470..2076cbb 100644
--- a/cs/torbutton.dtd
+++ b/cs/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "NastavenÃ soukromÃ">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ã?roveÅ? zabezpeÄ?enÃ">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "NÃzkÃ¡ (vÃ½chozÃ)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Toto umoÅ¾Å?uje nejpouÅ¾itelnÄ?jÅ¡Ã stav.">
 <!ENTITY torbutton.prefs.sec_low_desc "VÅ¡echny funkce prohlÃÅ¾eÄ?e jsou na tÃ©to bezpeÄ?nostnÃ Ãºrovni zapnuty.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Na nÄ?kterÃ½ch strÃ¡nkÃ¡ch se mohou skripty naÄ?Ãtat pomaleji.">
-<!ENTITY torbutton.prefs.sec_jar_desc "JAR objekty, kterÃ© jsou vzdÃ¡lenÃ©, jsou blokovÃ¡ny.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR soubory se vyskytujÃ na webu velmi zÅ?Ãdka, ale mohou bÃ½t zdrojem ÃºtokÅ¯ XSS a dalÅ¡Ãch.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "NÄ?kterÃ© mechanismy zobrazenÃ matematickÃ½ch korekcÃ jsou vypnuty.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML je vypnutÃ½.">
 <!ENTITY torbutton.prefs.sec_med_high "StÅ?ednÄ? vysokÃ¡">
diff --git a/csb/torbutton.dtd b/csb/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/csb/torbutton.dtd
+++ b/csb/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/cv/torbutton.dtd b/cv/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/cv/torbutton.dtd
+++ b/cv/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/cy/torbutton.dtd b/cy/torbutton.dtd
index f5e6e18..64f4ea3 100644
--- a/cy/torbutton.dtd
+++ b/cy/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/da/torbutton.dtd b/da/torbutton.dtd
index 7a4b2f6..1cd4737 100644
--- a/da/torbutton.dtd
+++ b/da/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privatlivs-indstillinger">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Undlad at registrere historik for browsing eller data for websteder (aktiverer tilstanden Privat browsing)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "BegrÃ¦ns tredjeparts-cookies og andre registreringsdata">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "SlÃ¥ browser-udvidelser fra (sÃ¥som Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Tilpas detaljer som adskiller dig fra andre Tor Browser-brugere">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Sikkerheds Niveau">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Lav (standard)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Dette giver dig den mest brugbare oplevelse.">
 <!ENTITY torbutton.prefs.sec_low_desc "PÃ¥ dette sikkerheds niveau er alle browser funktioner slÃ¥et til.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "GrundlÃ¦ggende JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts pÃ¥ nogle sider vil mÃ¥ske kÃ¸re langsommere.">
-<!ENTITY torbutton.prefs.sec_jar_desc "JAR filer pÃ¥ eksterne systemer er blokeret.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR filer er ekstremt sjÃ¦ldne pÃ¥ nettet, men kan vÃ¦re en kilde til bl.a. XSS angreb.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Nogle mekanismer for at vise matematikudtryk er koblet fra.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML er koblet fra.">
 <!ENTITY torbutton.prefs.sec_med_high "MellemhÃ¸j">
diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index f92595d..4cc658c 100644
--- a/de/torbutton.dtd
+++ b/de/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Neue Cookies schÃ¼tzen">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schÃ¼tzen">
 <!ENTITY torbutton.prefs.priv_caption "PrivatsphÃ¤reneinstellungen">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Browser-Verlauf und Internetdaten nicht speichern (aktiviert den privaten Browser-Modus)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere Ã?berwachungsdaten einschrÃ¤nken">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Browser-Erweiterungen deaktivieren (wie z.B. Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Details Ã¤ndern, die Sie von anderen Tor-Browser-Benutzern unterscheiden">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "gering (Standard)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Dies liefert die am meisten nutzbaren Erfahrungen.">
 <!ENTITY torbutton.prefs.sec_low_desc "Auf dieser Sicherheitsstufe sind alle Browserfunktionen aktiviert.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Typinferenz, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT-Basis.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts kÃ¶nnen auf manchen Seiten langsamer laufen.">
-<!ENTITY torbutton.prefs.sec_jar_desc "JAR-Dateien sind im Web extrem selten, kÃ¶nnen aber eine Quelle von XSS und anderen Attacken sein.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-Dateien sind sehr selten im Internet, aber sie kÃ¶nnen eine Quelle von XSS (WebseitenÃ¼bergreifendes Skripting) und anderer Angriffe sein.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Manche VorgÃ¤nge zur Anzeige von mathematischen Gleichungen sind deaktiviert.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ist deaktiviert.">
 <!ENTITY torbutton.prefs.sec_med_high "oberes Mittel">
diff --git a/dz/torbutton.dtd b/dz/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/dz/torbutton.dtd
+++ b/dz/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/el/torbutton.dtd b/el/torbutton.dtd
index 3450f03..09e94ed 100644
--- a/el/torbutton.dtd
+++ b/el/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Î Ï?Î¿Ï?Ï?Î±Ï?Î¯Î± Î?ÎÏ?Î½ Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Î?Î± Î?Î· Î³Î¯Î½ÎµÏ?Î±Î¹ Î Ï?Î¿Ï?Ï?Î±Ï?Î¯Î± Î?ÎÏ?Î½ Cookie">
 <!ENTITY torbutton.prefs.priv_caption "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î±Ï?Î¿Ï?Ï?Î®Ï?Î¿Ï?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Î?Î±Î¼Î¼Î¹Î± ÎºÎ±Ï?Î±Î³Ï?Î±Ï?Î· Ï?Î¿Ï? Î¹Ï?Ï?Î¿Ï?Î¹ÎºÏ?Ï? Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î·Ï? Î® Î´ÎµÎ´Î¿Î¼ÎÎ½Ï?Î½ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î±Ï? (ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Ï?Î· Ï?Î·Ï?  ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î·Ï? Î¹Î´Î¹Ï?Ï?Î¹ÎºÎ®Ï? Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î·Ï?) ">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Î ÎµÏ?Î¹Î¿Ï?Î¹Ï?Î¼Î¿Ï? Ï?Ï?Î½ cookies Ï?Ï?Î¹Ï?Ï?Î½ ÎºÎ±Î¹ Î±Î»Î»Ï?Î½ Î´ÎµÎ´Î¿Î¼ÎµÎ½Ï?Î½ Ï?Î±Ï?Î±ÎºÎ¿Î»Î¿Ï?Î¸Î·Ï?Î·Ï?">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Î½ Ï?ÎµÏ?Î¹Î·Î³Î·Ï?Î® (Ï?Î± Ï?Î¿ Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Î?Î»Î»Î¬Î¾Ï?Îµ Ï?Î¹Ï? Î»ÎµÏ?Ï?Î¿Î¼ÎÏ?ÎµÎ¹ÎµÏ? Ï?Î¿Ï? Ï?Î±Ï? Î´Î¹Î±ÎºÏ?Î¯Î½ÎµÎ¹ Î±Ï?Ï? Î¬Î»Î»Î¿Ï?Ï? Ï?Ï?Î®Ï?Ï?ÎµÏ? Ï?Î¿Ï? Tor Browser ">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Î?Ï?Î¯Ï?ÎµÎ´Î¿ Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Î§Î±Î¼Î·Î»Ï? (Ï?Ï?Î¿ÎµÏ?Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Î?Ï?Ï?Ï? Ï?Î±Ï?ÎÏ?ÎµÎ¹ Ï?Î·Î½ Ï?Î¹Î¿ ÎµÏ?Ï?Ï?Î·Ï?Ï?Î· ÎµÎ¼Ï?ÎµÎ¹Ï?Î¯Î±.">
 <!ENTITY torbutton.prefs.sec_low_desc "Î£Îµ Î±Ï?Ï?Ï? Ï?Î¿ ÎµÏ?Î¯Ï?ÎµÎ´Î¿ Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?, Ï?Î»ÎµÏ? Î¿Î¹ Î´Ï?Î½Î±Ï?Ï?Ï?Î·Ï?ÎµÏ? Ï?Î¿Ï? browser ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½ÎµÏ?.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Î¤Î± scripts Ï?Îµ ÎºÎ¬Ï?Î¿Î¹ÎµÏ? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ? ÎµÎ½Î´ÎÏ?ÎµÏ?Î±Î¹ Î½Î± Ï?Ï?ÎÏ?Î¿Ï?Î½ Ï?Î¹Î¿ Î±Ï?Î³Î¬. ">
-<!ENTITY torbutton.prefs.sec_jar_desc "Î¤Î± Î±Ï?Î¿Î¼Î±ÎºÏ?Ï?Ï?Î¼ÎÎ½Î± Î±Ï?Ï?ÎµÎ¯Î± Ï?Ï?Ï?Î¿Ï? JAR ÎµÎ¯Î½Î±Î¹ Î¼Ï?Î»Î¿ÎºÎ±Ï?Î¹Ï?Î¼ÎÎ½Î±.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Î¤Î± Î±Ï?Ï?ÎµÎ¯Î± Ï?Ï?Ï?Î¿Ï? JAR ÎµÎ¯Î½Î±Î¹ ÎµÎ¾Î±Î¹Ï?ÎµÏ?Î¹ÎºÎ¬ Ï?Ï?Î¬Î½Î¹Î± Ï?Ï?Î¿Î½ Î?Ï?Ï?Ï?, Î±Î»Î»Î¬ Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Î±Ï?Î¿Ï?ÎµÎ»Î¿Ï?Î½ Ï?Î·Î³Î® XSS ÎºÎ±Î¹ Î¬Î»Î»Ï?Î½ ÎµÏ?Î¹Î¸ÎÏ?ÎµÏ?Î½.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Î?Î¬Ï?Î¿Î¹Î¿Î¹ Î¼Î·Ï?Î±Î½Î¹Ï?Î¼Î¿Î¯ Î³Î¹Î± ÎµÎ¼Ï?Î¬Î½Î¹Ï?Î· Î¼Î±Î¸Î·Î¼Î±Ï?Î¹ÎºÏ?Î½ ÎµÎ¾Î¹Ï?Ï?Ï?ÎµÏ?Î½ ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿Î¹.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ÎµÎ¹Î½Î±Î¹ ÎµÏ?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿.">
 <!ENTITY torbutton.prefs.sec_med_high "Î?ÎµÏ?Î±Î¯Î¿-Ï?Ï?Î·Î»Ï?">
diff --git a/en/torbutton.dtd b/en/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/en/torbutton.dtd
+++ b/en/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/en_GB/torbutton.dtd b/en_GB/torbutton.dtd
index 2a1fb98..a43bcd6 100644
--- a/en_GB/torbutton.dtd
+++ b/en_GB/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (Default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/eo/torbutton.dtd b/eo/torbutton.dtd
index 8120c04..50a0b8e 100644
--- a/eo/torbutton.dtd
+++ b/eo/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Agordoj de privateco">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Sekureca nivelo">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Malalta (implicita)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Meze alta">
diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index 8be5bf5..f68a1f3 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies">
 <!ENTITY torbutton.prefs.priv_caption "ParÃ¡metros de privacidad">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "No registrar historial de navegaciÃ³n o datos del sitio web (habilita Modo de NavegaciÃ³n Privada)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Desactivar complementos del navegador (como Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios del Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Bajo (por defecto)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Esto proporciona la mejor experiencia de usabilidad.">
 <!ENTITY torbutton.prefs.sec_low_desc "En este nivel de seguridad, todas las funciones del navegador estÃ¡n habilitadas.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantÃ¡neo optimizado), Type Inference (deducciÃ³n del tipo de datos por el compilador), ASM.JS (JS intermedio para alto rendimiento de otros lenguajes)">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT (compilador JS instantÃ¡neo)">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Los scripts en algunos sitios puede que se ejecuten mÃ¡s lentamente.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Los ficheros JAR remotos estÃ¡n bloqueados.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Los ficheros JAR son extremadamente raros en la web, pero pueden ser una fuente de ataques XSS y de otros tipos.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Algunos mecanismos de representaciÃ³n de ecuaciones matemÃ¡ticas estÃ¡n deshabilitados.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML estÃ¡ deshabilitado.">
 <!ENTITY torbutton.prefs.sec_med_high "Medio-Alto">
diff --git a/es_AR/torbutton.dtd b/es_AR/torbutton.dtd
index 90cdfc8..2cd50cc 100644
--- a/es_AR/torbutton.dtd
+++ b/es_AR/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Configuraciones de privacidad ">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "No guardar el historial de navegaciÃ³n o los datos de la web ( activa el modo de NavegaciÃ³n Privada)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de rastreo">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Desactivar plugins de los buscadores (como Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Variar los detalles que te distinguen de otros usuarios del Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Bajo (defecto)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Provee la mejor experiencia de uso.">
 <!ENTITY torbutton.prefs.sec_low_desc "En este nivel de seguridad, todas las caracteristicas del navegador estan disponibles.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, interfaces de Tipo, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "En algunos sitios los scripts se ejecutaran mas lentamente.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Los archivos remotos JAR estan bloqueados.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Los archivos JAR son extremadamente raros en la web, pero pueden la fuente de ataques XSS entre otros.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Algunos mecanizmos para representar ecuaciones matemÃ¡ticas estÃ¡n deshabilitados. ">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML esta deshabilitado.">
 <!ENTITY torbutton.prefs.sec_med_high "Medio-Alto">
diff --git a/es_CL/torbutton.dtd b/es_CL/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/es_CL/torbutton.dtd
+++ b/es_CL/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/es_CO/torbutton.dtd b/es_CO/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/es_CO/torbutton.dtd
+++ b/es_CO/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/es_MX/torbutton.dtd b/es_MX/torbutton.dtd
index eeba67e..800a7d4 100644
--- a/es_MX/torbutton.dtd
+++ b/es_MX/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/et/torbutton.dtd b/et/torbutton.dtd
index 723647c..171c721 100644
--- a/et/torbutton.dtd
+++ b/et/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/eu/torbutton.dtd b/eu/torbutton.dtd
index 16b8d51..f2d16a6 100644
--- a/eu/torbutton.dtd
+++ b/eu/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Cookie berriak babestu">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ez babestu cookie berririk">
 <!ENTITY torbutton.prefs.priv_caption "Pribatutasun ezarpenak">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ez grabatu nabigatze historia edo webgune datuak (Nabigatze pribatu modua gaitzen du)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Nabigatzaile pluginak ezgaitu (Flash bezala)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Segurtasun maila">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Baxua (lehentsia)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Urruneko JAR fitxategiak blokeatuta daude.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR fitxategiak oso bitxiak dira webean, baina XSS eta beste eraso batzuen jatorria izan daitezke.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ezgaituta dago.">
 <!ENTITY torbutton.prefs.sec_med_high "Ertaina-altua">
diff --git a/fa/torbutton.dtd b/fa/torbutton.dtd
index 0756e1d..750857e 100644
--- a/fa/torbutton.dtd
+++ b/fa/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ØÙ?Ø§Ø¸Øª Ø§Ø² Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§Û? Ø¬Ø¯Ù?Ø¯">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ø¹Ø¯Ù? ØÙ?Ø§Ø¸Øª Ø§Ø² Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§Û? Ø¬Ø¯Ù?Ø¯">
 <!ENTITY torbutton.prefs.priv_caption "ØªÙ?Ø¸Û?Ù?Ø§Øª ØØ±Û?Ù? Ø®ØµÙ?ØµÛ?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ø«Ø¨Øªâ??Ù?Ù?Ø±Ø¯Ù? ØªØ§Ø±Ù?Ø®Ú?Ù? Ù?Ø§ Ø¯Ø§Ø¯Ù?â??Ù?Ø§Ù? Ù?Ø¨â??Ú¯Ø§Ù? (Ú¯Ø´Øª Ù? Ú¯Ø°Ø§Ø± â??Ø®ØµÙ?ØµÙ? Ù?Ø¹Ø§Ù? Ù?Ù?â??Ù?Ù?Ø¯)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ù?ØØ¯Ù?Ø¯â??Ù?Ø±Ø¯Ù? Ù?Ù?Ù?Ù?â??Ù?Ø§Ù? Ø·Ø±Ù? Ø³Ù?Ù? Ù? Ø¯Ø§Ø¯Ù?â??Ù?Ø§Ù? Ù¾Ù?Ú¯Ø±Ø¯Ù? Ø¯Ù?Ú¯Ø±">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "ØºÙ?Ø±Ù?Ø¹Ø§Ù?â??Ù?Ø±Ø¯Ù? Ø§Ù?Ø²Ø§Ù?Ù?â??Ù?Ø§Ù? Ù?Ø±Ù?Ø±Ú¯Ø± (Ù?Ø«Ù? Ù?Ù?Ø´)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ØªØºÙ?Ù?Ø±Ø¯Ø§Ø¯Ù? Ø¬Ø²Ø¦Ù?Ø§ØªÙ? Ù?Ù? Ø´Ù?Ø§Ø±Ø§ Ø§Ø² Ù?Ø§Ø±Ø¨Ø±Ø§Ù? Ø¯Ù?Ú¯Ø± ØªÙ?Ø± ØªÙ?Ù?Ø²Ù?Ù?â??Ù?Ù?Ø¯">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ø³Ø·Ø Ø§Ù?Ù?Û?Øª">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Ù¾Ø§Û?Û?Ù? (Ø¨Ù? Ø·Ù?Ø± Ù¾Û?Ø´ Ù?Ø±Ø¶)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ø§Û?Ù? Ù?Ø±Ø§Ù?Ù? Ù?Û? Ú©Ù?Ø¯ Ø¨Û?Ø´ØªØ±Û?Ù? ØªØ¬Ø±Ø¨Ù? Ù?Ø§Ø¨Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù?.">
 <!ENTITY torbutton.prefs.sec_low_desc "Ø¯Ø± Ø§Û?Ù? Ø³Ø·Ø Ø§Ù?Ù?Û?ØªÛ?Ø? ØªÙ?Ø§Ù? Ù?Û?Ú?Ú¯Û? Ù?Ø§Û? Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø§ Ù?Ø¹Ø§Ù? Ø§Ø³Øª.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT Ø¯Ø± Ø´Ø±Ù?Ø¹ Ù?Ø·Ø§Ù?Ø¹Ù?.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Ø§Ø³Ú©Ø±Û?Ù¾Øª Ù?Ù? Ø¯Ø± Ø¨Ø±Ø®Û? Ø§Ø² Ø³Ø§Û?Øª Ù?Ø§ Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¢Ù?Ø³ØªÙ? ØªØ± Ø§Ø¬Ø±Ø§ Ø´Ù?Ø¯.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Ù?Ø§Û?Ù? Ù?Ø§Û? JAR Ø§Ø² Ø±Ø§Ù? Ø¯Ù?Ø± Ù?Ø³Ø¯Ù?Ø¯.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Ù?Ø§Û?Ù? Ù?Ø§ Ø¨Ø§ Ù¾Ø³Ù?Ù?Ø¯ JAR Ø¨Ù? Ù?Ø¯Ø±Øª Ø¯Ø± Ù?Ø¨ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û? Ø´Ù?Ù?Ø¯ Ø? Ù?Ù?Û? Ù?Û? ØªÙ?Ø§Ù?Ù?Ø¯ Ù?Ø¨Ø¯Ø§Û?Û? Ø¨Ø±Ø§Û? Ù?Ú© Ø¨Ù? Ø±Ù?Ø´ XSS Ù? Ø¯Û?Ú¯Ø± ØÙ?Ù?Ø§Øª Ù?Ú©Ø±Û? Ø´Ù?Ù?Ø¯.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Ø¨Ø±Ø®Û? Ù?Ú©Ø§Ù?Û?Ø³Ù? Ù?Ø§ Ù?Ù?Ø§Û?Ø´ Ù?Ø¹Ø§Ø¯Ù?Ø§Øª Ø±Û?Ø§Ø¶Û? ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ù?Û? Ø¨Ø§Ø´Ø¯.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ø§Ø³Øª.">
 <!ENTITY torbutton.prefs.sec_med_high "Ù?ØªÙ?Ø³Ø· â??â??- Ø¨Ø§Ù?Ø§">
diff --git a/fi/torbutton.dtd b/fi/torbutton.dtd
index dd98aa4..414df5f 100644
--- a/fi/torbutton.dtd
+++ b/fi/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evÃ¤steet">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ã?lÃ¤ suojaa uusia evÃ¤steitÃ¤">
 <!ENTITY torbutton.prefs.priv_caption "Yksityisyysasetukset">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ã?lÃ¤ sÃ¤ilytÃ¤ selaushistoriaa tai verkkosivuston tietoja (kÃ¤ynnistÃ¤Ã¤ yksityisen selauksen)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "EstÃ¤ kolmannen osapuolen evÃ¤steet ja muut seurantatiedot">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Poista selainliitÃ¤nnÃ¤iset (Flash yms.) kÃ¤ytÃ¶stÃ¤">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Muuta lisÃ¤tietoja, jotka erottavat sinut muista Tor-selainkÃ¤yttÃ¤jistÃ¤">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Turvallisuustaso">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Alhainen (oletus)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "TÃ¤mÃ¤ tarjoaa kaikkein kÃ¤yttÃ¶kelpoisimman kokemuksen.">
 <!ENTITY torbutton.prefs.sec_low_desc "TÃ¤llÃ¤ turvatasolla kaikki selainominaisuudet ovat kÃ¤ytÃ¶ssÃ¤.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, TyyppipÃ¤Ã¤ttely, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skriptit joissakin sivustoissa voivat toimia hitaammin.">
-<!ENTITY torbutton.prefs.sec_jar_desc "EtÃ¤-JAR-tiedostot estetty.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-tiedostot ovat Ã¤Ã¤rimmÃ¤isen harvinaisia webissÃ¤, mutta voivat olla XSS- ja muiden hyÃ¶kkÃ¤ysten lÃ¤hteenÃ¤.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Jotkut matemaattisten yhtÃ¤lÃ¶iden nÃ¤yttÃ¤mismekanismit ovat poissa kÃ¤ytÃ¶stÃ¤.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML on poissa kÃ¤ytÃ¶stÃ¤.">
 <!ENTITY torbutton.prefs.sec_med_high "Keskitaso-Korkea">
diff --git a/fil/torbutton.dtd b/fil/torbutton.dtd
index 71f70a9..056d600 100644
--- a/fil/torbutton.dtd
+++ b/fil/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Mga Setting na Pang-Pribado">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Lebel ng Seguridad">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Mababa (rematado)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Gitnang-Mataas">
diff --git a/fo/torbutton.dtd b/fo/torbutton.dtd
index a285af7..38a9dad 100644
--- a/fo/torbutton.dtd
+++ b/fo/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Verj nÃ½ggjar cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Verj ikki nÃ½ggjar cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privatir stilligar">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Goym ikki afturlit ella vevdÃ¡tu frÃ¡ kaga (gildar privata reiking)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Avmarka triÃ°jaliÃ°s-cookies og aÃ°ra sporingardÃ¡tu">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Ã?gilda Ãskoytisforrit til kaga (til dÃ¸mis Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Broyt upplÃ½singar, sum skilja teg frÃ¡ Ã¸Ã°rum, sum brÃºka Tor-kagan">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Trygdarstig">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "LÃ¡gt (vanliga)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "MiÃ°al-hÃ¸gt">
diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd
index d019b22..b24a33b 100644
--- a/fr/torbutton.dtd
+++ b/fr/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ProtÃ©ger les nouveaux cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux cookies">
 <!ENTITY torbutton.prefs.priv_caption "ParamÃ¨tres de vie privÃ©e">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les donnÃ©es des sites webs (active le Mode de Navigation PrivÃ©e)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres donnÃ©es de traÃ§age">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "DÃ©sactiver les greffons du navigateur (tels que Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les dÃ©tails qui vous distinguent des autres utilisateurs du Navigateur Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Niveau de sÃ©curitÃ©">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Faible (par dÃ©faut)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Cela offre l'expÃ©rience la plus agrÃ©able.">
 <!ENTITY torbutton.prefs.sec_low_desc "A ce niveau de sÃ©curitÃ©, toutes les fonctions de navigation sont activÃ©es.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "JIT ION, infÃ©rence de types, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT Baseline.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts sur certains sites peuvent Ãªtre ralentis.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Les fichiers distants JAR sont bloquÃ©s.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Les fichiers JAR sont extrÃªmement rares sur le Web, mais peuvent Ãªtre une source d'attaques XSS et autres.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Quelques mÃ©canismes d'affichage d'Ã©quations mathÃ©matiques sont dÃ©sactivÃ©s.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est dÃ©sactivÃ©.">
 <!ENTITY torbutton.prefs.sec_med_high "Moyennement haut">
diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd
index 948577d..ce22d99 100644
--- a/fr_CA/torbutton.dtd
+++ b/fr_CA/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ProtÃ©ger les nouveaux tÃ©moins">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux tÃ©moins">
 <!ENTITY torbutton.prefs.priv_caption "ParamÃ¨tres de confidentialitÃ©">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les donnÃ©es des sites Web (active le mode de navigation privÃ©e)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les tÃ©moins tiers et les autres donnÃ©es de traÃ§age">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "DÃ©sactiver les plugiciels du navigateur (tel que Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les dÃ©tails qui vous distingue d'autres utilisateurs du navigateur Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Niveau de sÃ©curitÃ©">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Bas (par dÃ©faut)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ceci offre l'expÃ©rience la plus conviviale.">
 <!ENTITY torbutton.prefs.sec_low_desc "Ã? ce niveau de sÃ©curitÃ©, toutes les fonctions du navigateur sont activÃ©es.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, infÃ©rence de type, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts pourraient Ãªtre exÃ©cutÃ©s plus lentement sur certains sites.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Les fichiers JAR distants sont bloquÃ©s.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Les fichiers JAR sont extrÃªmement rares sur le Web, mais pourraient Ãªtre la source de XSS ou d'autres attaques. ">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Certains mÃ©canismes d'affichage des Ã©quations mathÃ©matiques sont dÃ©sactivÃ©s.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est dÃ©sactivÃ©.">
 <!ENTITY torbutton.prefs.sec_med_high "Moyen-haut">
diff --git a/fur/torbutton.dtd b/fur/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/fur/torbutton.dtd
+++ b/fur/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/fy/torbutton.dtd b/fy/torbutton.dtd
index ac5ee61..4453eeb 100644
--- a/fy/torbutton.dtd
+++ b/fy/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy-ynstellingen">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Befeiligingsnivo">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Leech (standert)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Midsmjittich-Heech">
diff --git a/ga/torbutton.dtd b/ga/torbutton.dtd
index 8cbbe97..119b3e3 100644
--- a/ga/torbutton.dtd
+++ b/ga/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Beag (Ã©agmaise)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "MeÃ¡n-Ard">
diff --git a/gd/torbutton.dtd b/gd/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/gd/torbutton.dtd
+++ b/gd/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/gl/torbutton.dtd b/gl/torbutton.dtd
index b4c5c67..fad7d3d 100644
--- a/gl/torbutton.dtd
+++ b/gl/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Axustes de privacidade">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/gu/torbutton.dtd b/gu/torbutton.dtd
index 3c154e1..df05cae 100644
--- a/gu/torbutton.dtd
+++ b/gu/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/gu_IN/torbutton.dtd b/gu_IN/torbutton.dtd
index d96c827..a6f3b46 100644
--- a/gu_IN/torbutton.dtd
+++ b/gu_IN/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "àª?àª?àª?àª¤àª¤àª¾ àª?à«?àª àªµàª£à«?àª?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/gun/torbutton.dtd b/gun/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/gun/torbutton.dtd
+++ b/gun/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ha/torbutton.dtd b/ha/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ha/torbutton.dtd
+++ b/ha/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/he/torbutton.dtd b/he/torbutton.dtd
index e70a05b..7be8a14 100644
--- a/he/torbutton.dtd
+++ b/he/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "×?×?×? ×¢×? ×§×?×§×?×? ×?×?×©×?×?">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "×?×? ×ª×?×? ×¢×? ×§×?×§×?×? ×?×?×©×?×?">
 <!ENTITY torbutton.prefs.priv_caption "×?×?×?×¨×?×ª ×¤×¨×?×?×?×ª">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "×?×? ×ª×©×?×?×¨ ×?×?×¡×?×?×¨×?×?×ª ×?×?×?×©×? ×?×? × ×ª×?× ×? ×?×ª×¨×?×? (×?×¤×¢×? ×?×¦×? ×?×?×?×©×? ×¤×¨×?×?×ª)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "×?×?×?×? ×¢×?×?×?×?×ª ×?×¦×? ×©×?×?×©×? ×?×?×?×¡×?×£ ×?×?×?×¢ ×?×?×¨">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "×?×©×?×ª ×ª×?×¡×¤×? ×?×¤×?×¤×? (×?×?×?×? Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "×©× ×? ×¤×¨×?×?×? ×?×?×?×?×?×?×?×? ×?×?× ×? ×?×?×?×? ×?×ª×¨ ×?×©×ª×?×©×? ×?×¤×?×¤×? Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "×¨×?×ª ×?×?×?×?×?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "× ×?×?×?×? (×?×¨×?×¨×ª ×?×?×?×?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "×¨×?×? ×?×? ×?×¡×¤×§×ª ×?×?×?×?×?×ª ×?×©×ª×?×© ×?×?×?×?×?×ª.">
 <!ENTITY torbutton.prefs.sec_low_desc "×?×¨×?×ª ×?×?×?×?×? ×?×?, ×?×? ×ª×?×?× ×?×ª ×?×?×¤×?×¤×? ×?×?×¤×¢×?×?×ª.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT ×?×¡×?×¡×?.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "×¡×§×¨×?×¤×?×?×? ×?×?×ª×¨×?×? ×?×¡×?×?×? ×?×¡×?×?×? ×?×?×?×?×?.">
-<!ENTITY torbutton.prefs.sec_jar_desc "×§×?×¦×? JAR ×?×¡×?×?×?×? ×?×?×?×©×? ×?×¨×?×?×§.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "×§×?×¦×? JAR × ×?×?×¨×?×? ×?×?×?×? ×?×¨×©×ª ×?×?×?×?, ×?×? ×¢×?×?×?×?×? ×?×?×?×?×ª ×?×§×?×¨ ×?×?×ª×§×¤×?×ª XSS ×?×?×?×¨×?×ª.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "×?×?×§ ×?×?× ×?× ×?× ×? ×?×¦×?×ª ×?×©×?×?×?×?×ª ×?×ª×?×?×?×?×ª ×?×?×?×?×?×?×? ×?×¢×ª.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ×?×?×?×?×? ×?×¢×ª.">
 <!ENTITY torbutton.prefs.sec_med_high "×?×?× ×?× ×?×ª-×?×?×?×?×?">
diff --git a/hi/torbutton.dtd b/hi/torbutton.dtd
index 05075bf..b417e3b 100644
--- a/hi/torbutton.dtd
+++ b/hi/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "à¤?à¤?à¤¾à¤?à¤¤ à¤?à¥? à¤²à¤¿à¤? à¤ªà¤¤à¤¿à¤¸à¥?à¤¥à¤¿à¤¤à¤¿à¤¯à¤¾à¤?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/hr/torbutton.dtd b/hr/torbutton.dtd
index 6b2e9a4..29403d3 100644
--- a/hr/torbutton.dtd
+++ b/hr/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Postavke Privatnosti">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Nivo Sigurnosti">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Nisko (zadano)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ovo pruÅ¾a najupotrebljiviji doÅ¾ivljaj.">
 <!ENTITY torbutton.prefs.sec_low_desc "Na ovoj sigurnosnoj razini, sve znaÄ?ajke preglednika su omoguÄ?ene.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skripte mogu biti sporije na nekim stranicama.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Udaljene JAR datoteke su blokirane.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR datoteke su ekstremno rijetke ne webu, ali mogu biti izvor XSS i ostalih napada.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Neki mehanizmi prikaza matematiÄ?kih jednadÅ¾bi su onemoguÄ?eni.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML je onemoguÄ?en.">
 <!ENTITY torbutton.prefs.sec_med_high "Srednje-Visoko">
diff --git a/hr_HR/torbutton.dtd b/hr_HR/torbutton.dtd
index 539e633..b9b08eb 100644
--- a/hr_HR/torbutton.dtd
+++ b/hr_HR/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ZaÅ¡titi nove kolaÄ?iÄ?e">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nemoj Å¡titi nove kolaÄ?iÄ?e">
 <!ENTITY torbutton.prefs.priv_caption "Postavke privatnosti">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ne snimaj povijest pregledavanja ili podatke stranica (omoguÄ?uje Mod Privatnog Pregledavanja)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "OgraniÄ?i kolaÄ?iÄ?e treÄ?e strane i ostale podatke za praÄ?enje">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Onesposobi prikljuÄ?ke preglednika (npr. Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Promjeni detalje koji te razlikuju od ostalih korisnika Tora">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Razina sigurnosti">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Niska (zadano)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ovo pruÅ¾a najiskoristivije iskustvo.">
 <!ENTITY torbutton.prefs.sec_low_desc "Na ovoj sigunosnoj razini, sve znaÄ?ajke preglednika su omoguÄ?ene.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Interface, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skripte nekih stranica bi mogle biti sporije.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Udaljene JAR datoteke su blokirane.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR datoteke su ekstremno rijetke na mreÅ¾i, ali mogu biti izvor XSS i drugih napada.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Neki mehanizmi prikazivanja matematiÄ?kih jednadÅ¾bi su onemoguÄ?eni.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML je onemoguÄ?en.">
 <!ENTITY torbutton.prefs.sec_med_high "Srednje visoka">
diff --git a/ht/torbutton.dtd b/ht/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ht/torbutton.dtd
+++ b/ht/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/hu/torbutton.dtd b/hu/torbutton.dtd
index 685caad..d74038b 100644
--- a/hu/torbutton.dtd
+++ b/hu/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "VÃ©dje az Ãºj sÃ¼tiket">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne vÃ©dje az Ãºj sÃ¼tiket">
 <!ENTITY torbutton.prefs.priv_caption "AdatvÃ©delmi BeÃ¡llÃtÃ¡sok">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ne rÃ¶gzÃtsen bÃ¶ngÃ©szÅ? elÅ?zmÃ©nyeket, vagy weboldal adatot (engedÃ©lyezi a PrivÃ¡t bÃ¶ngÃ©szÅ? mÃ³dot)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik fÃ©ltÅ?l szÃ¡rmazÃ³ sÃ¼tik Ã©s nyomkÃ¶vetÃ©si adatok korlÃ¡tozÃ¡sa">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "BÃ¶ngÃ©szÅ? kiegÃ©szÃtÅ?k kikapcsolÃ¡sa (mint pl. a Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "VÃ¡ltoztassa meg a rÃ©szleteket, amik megkÃ¼lÃ¶nbÃ¶ztetik a tÃ¶bbi Tor Browser felhasznÃ¡lÃ³tÃ³l">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "BiztonsÃ¡gi szint">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Alacsony (alapÃ©rtelmezett)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ez biztosÃtja a legjobb felhasznÃ¡lÃ³i Ã©lmÃ©nyt.">
 <!ENTITY torbutton.prefs.sec_low_desc "Ezen a biztonsÃ¡gi szinten minden bÃ¶ngÃ©szÅ? lehetÅ?sÃ©g bekapcsolt.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "A szkriptek nÃ©hÃ¡ny oldalon lassabban futnak.">
-<!ENTITY torbutton.prefs.sec_jar_desc "TÃ¡voli JAR fÃ¡jlok blokkolva.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "A JAR fÃ¡jlok nagyon ritkÃ¡k a weben, de a forrÃ¡sai lehetnek az XSS Ã©s mÃ¡s tÃ¡madÃ¡soknak.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "NÃ©hÃ¡ny matematikai fÃ¼ggvÃ©ny megjelenÃtÅ? algoritmus tiltott.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML tiltott.">
 <!ENTITY torbutton.prefs.sec_med_high "KÃ¶zepesen magas">
diff --git a/hy/torbutton.dtd b/hy/torbutton.dtd
index deb3eac..b5cc74b 100644
--- a/hy/torbutton.dtd
+++ b/hy/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö?Õ©ÕµÕ¡Õ¶ Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö?Õ¤Õ¡Õ¯Õ¨">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Õ?Õ¡Õ®Ö? (Õ¬Õ¼Õ¥Õ¬Õ¡ÕµÕ¶)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Õ?Õ¥Õ¼Õ¡Õ¯Õ¡ JAR Ö?Õ¡ÕµÕ¬Õ¥Ö?Õ¨ Õ¡Ö?Õ£Õ¥Õ¬Õ¡Ö?Õ¡Õ¯Õ¾Õ¡Õ® Õ¥Õ¶:">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML-Õ¨ Õ¡Õ¶Õ»Õ¡Õ¿Õ¾Õ¡Õ® Õ§:">
 <!ENTITY torbutton.prefs.sec_med_high "Õ?Õ«Õ»Õ«Õ¶-Õ¢Õ¡Ö?Õ±Ö?">
diff --git a/ia/torbutton.dtd b/ia/torbutton.dtd
index 4823044..4807a44 100644
--- a/ia/torbutton.dtd
+++ b/ia/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/id/torbutton.dtd b/id/torbutton.dtd
index ac72d78..a4a612d 100644
--- a/id/torbutton.dtd
+++ b/id/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Pengaturan Privasi">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Nonaktifkan ...">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ubah rincian yang membedakan Anda dari pengguna peramban Tor lain.">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Tingkat Keamanan">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Rendah (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Memberikan pengalaman paling umum.">
 <!ENTITY torbutton.prefs.sec_low_desc "Pada tingkat keamanan ini, semua fitur peramban diaktifkan.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Tipe Simpulan, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Garis dasar JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Script pada beberapa situs mungkin pelan.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Berkas rimut JAR diblokir.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Berkas JAR sangat jarang ada di web, tetapi bisa menjadi sumber XSS dan serangan lain.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Beberapa pengatur penampilan persamaan matematika dinonaktifkan.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML dinonaktifkan.">
 <!ENTITY torbutton.prefs.sec_med_high "Menengah-Tinggi">
diff --git a/is/torbutton.dtd b/is/torbutton.dtd
index 291ea67..3a70dc9 100644
--- a/is/torbutton.dtd
+++ b/is/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Vernda nÃ½jar smÃ¡kÃ¶kur">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ekki vernda nÃ½jar smÃ¡kÃ¶kur">
 <!ENTITY torbutton.prefs.priv_caption "Stillingar gagnaleyndar">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ekki skrÃ¡ feril vafurs eÃ°a gÃ¶gn vefsvÃ¦Ã°a (virkjar einkavafurham)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Takmarka smÃ¡kÃ¶kur frÃ¡ Ã¾riÃ°ja aÃ°ila og Ã¶nnur ferligÃ¶gn">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Gera vafraviÃ°bÃ¦tur Ã³virkar (svo sem Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Breyta atriÃ°um sem gera Ã¾ig Ã³lÃkan Ã¶Ã°rum notendum Tor-vafrans">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ã?ryggisstig">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "LÃ¡gt (sjÃ¡lfgefiÃ°)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ã?etta gefur notadrÃ½gstu virknina.">
 <!ENTITY torbutton.prefs.sec_low_desc "Ã? Ã¾essu Ã¶ryggisstigi eru allir eiginleikar vafrans virkjaÃ°ir.">
@@ -43,8 +49,6 @@ breytingar (svÃfa yfir meÃ° bendli til aÃ° sjÃ¡ nÃ¡nar):">
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skriftur gÃ¦tu keyrt hÃ¦gar Ã¡ sumum vefsvÃ¦Ã°um.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Fjartengdar JAR-skrÃ¡r eru Ã³virkar.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-skrÃ¡r eru Ã¡kaflega sjaldgÃ¦far Ã¡ vefnum, en Ã¾Ã¦r geta veriÃ° notaÃ°ar fyrir XSS Ã¡rÃ¡sir og annaÃ° slÃkt.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Sumar aÃ°ferÃ°ir viÃ° birtingu stÃ¦rÃ°frÃ¦Ã°ijafna eru Ã³virkar.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML er Ã³virkt.">
 <!ENTITY torbutton.prefs.sec_med_high "MiÃ°lungs-hÃ¡tt">
diff --git a/it/torbutton.dtd b/it/torbutton.dtd
index f7a9ea0..37ddb70 100644
--- a/it/torbutton.dtd
+++ b/it/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteggi i nuovi cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie">
 <!ENTITY torbutton.prefs.priv_caption "Impostazioni Privacy">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Non registrare la cronologia di navigazione o i dati dei siti (attiva la Navigazione Anonima)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disabilita i plugin del browser (come Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Basso (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Questo permette la migliore esperienza di usablitÃ .">
 <!ENTITY torbutton.prefs.sec_low_desc "A questo livello di sicurezza, tutte le features del browser sono abilitate.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Gli scripts su alcuni siti possono girare piÃ¹ lenti.">
-<!ENTITY torbutton.prefs.sec_jar_desc "I file JAR remoti sono bloccati.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "I file JAR sono molto rari nel web, ma possono essere fonte di XSS o altri attacchi.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Alcuni meccanismi di visualizzazione di equazioni matematiche sono disabilitati.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ã¨ disabilitato.">
 <!ENTITY torbutton.prefs.sec_med_high "Medio-Alto">
diff --git a/ja/torbutton.dtd b/ja/torbutton.dtd
index bd66d0f..4743927 100644
--- a/ja/torbutton.dtd
+++ b/ja/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "æ?°ã??ã??Cookieã??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "æ?°ã??ã??Cookieã??ä¿?è·ã??ã?ªã??">
 <!ENTITY torbutton.prefs.priv_caption "ã??ã?©ã?¤ã??ã?·ã?¼è¨å®?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "ã??ã?©ã?¦ã?¸ã?³ã?°å±¥æ´ã??ã?¦ã?§ã??ã?µã?¤ã??ã?®ã??ã?¼ã?¿ã??è¨?é?²ã??ã?ªã?? (ã??ã?©ã?¤ã??ã?¼ã??ã??ã?©ã?¦ã?¸ã?³ã?°ã?¢ã?¼ã??ã??æ??å?¹å??)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ã?µã?¼ã??ã??ã?¼ã??ã?£ã?¼ã?®Cookieã??ã??ã?®ä»?ã?®ã??ã?©ã??ã?ã?³ã?°ã??ã?¼ã?¿ã??å?¶é??">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "ã??ã?©ã?¦ã?¶ã?®ã??ã?©ã?°ã?¤ã?³(ã??ã?©ã??ã?·ã?¥ã?ªã?©)ã??ç?¡å?¹å??">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ã??ã?ªã??ã?¨ã?»ã??ã?®Torã??ã?©ã?¦ã?¶ã?®ã?¦ã?¼ã?¶ã?¼ã??å?ºå?¥ã??ã??è©³ç´°ã??å¤?æ?´">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "ã?»ã?ã?¥ã?ªã??ã?£ã?¬ã??ã?«">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "ä½?ã??(ã??ã??ã?©ã?«ã??)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "æ??å¤§ã?®å?©ä¾¿æ?§ã??æ??ä¾?ã??ã?¾ã??ã??">
 <!ENTITY torbutton.prefs.sec_low_desc "ã??ã?®ã?¬ã??ã?«ã?§ã?¯ã??å?¨ã?¦ã?®ã??ã?©ã?¦ã?¶ã?¼ã?®æ©?è?½ã??æ??å?¹å??ã??ã??ã?¾ã??ã??">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JITã??å??ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ASM.JSã??">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "å?ºæ?¬ç??ã?ªJITã??">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "ã?µã?¤ã??ã?«ã??ã?£ã?¦ã?¯ã?¹ã?¯ã?ªã??ã??ã?®å??ä½?ã??é??ã??ã?ªã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_jar_desc "ã?ªã?¢ã?¼ã??ã?® JAR ã??ã?¡ã?¤ã?«ã??ã??ã?ã??ã?¯ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Web ä¸?ã?§ JAR ã??ã?¡ã?¤ã?«ã??å?©ç?¨ã??ã??ã??ã??ã?¨ã?¯ç¨?ã?§ã??ã??ã?? XSS ã?ªã?©ã?«ä½¿ã??ã??ã??ã??ã?¨ã??ã??ã??ã?¾ã??ã??">
 <!ENTITY torbutton.prefs.sec_mathml_desc "æ?°å¼?ã??è¡¨ç¤ºã??ã??ã??ã??ã?®ã??ã??ã?¤ã??ã?®æ©?è?½ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
 <!ENTITY torbutton.prefs.sec_med_high "é«?ä¸">
diff --git a/jv/torbutton.dtd b/jv/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/jv/torbutton.dtd
+++ b/jv/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ka/torbutton.dtd
+++ b/ka/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/kk/torbutton.dtd b/kk/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/kk/torbutton.dtd
+++ b/kk/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/km/torbutton.dtd b/km/torbutton.dtd
index 8761670..b101c80 100644
--- a/km/torbutton.dtd
+++ b/km/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á??á?¶á??á??á?¶á??â??á??á?¼á??á?¸â??á??á??á??á?¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á??á?»á??â??á??á?¶á??â??á??á?¶á??â??á??á?¼á??á?¸â??á??á??á??á?¸">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "á??á?»á??â??á??á?¶á??á??á?¶á??á??á??â??á??á??á??á??á??á??á??á?· á?¬â??á??á?·á??á??á??á??á??á??â??á??á??á??á??á??â??á??á??á??á??á?¶á?? (á??á?¾á??â??á??á??á??á??â??á??á?¶á??â??á??á?»á??á??á??â??á?¯á??á??á??)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "á??á?¶á??á??â??á??á??á??á??á?·á??â??á??á?¼á??á?¸â??á??á?¶á??á?¸â??á??á?¸á??á?¸ á??á?·á??â??á??á?·á??á??á??á??á??á??â??á??á?¶á??á??á?¶á??â??á??á??á??á??á??â??á??á??á??">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "á??á?·á??â??á??á??á??á??á??á?·á??á?¸â??á??á??á??á?½á??â??á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á?? (á??á?¼á??â??á??á?¶â??á?§á??á??á??á??á??â??á??á??á??á?»á??â??á??á??á??á??)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "á??á??á??á?¶á??á??á??á??á??á?¼á??â??á??á??á??á??á??á?¶á??â??á??á??á??á?¢á?·á??â??á??á??á??â??â??á??á??á??á? á?¶á??â??á??á?¶á??â??á??á?»á??â??á??á??á??á?¶â??á?¢á??á??á??â??á??á?¸â??á?¢á??á??á??â??á??á??á??á?¾á??á??á??á?¶á??á??â?? Tor Browser á??á??á??á??á??â??á??á??á??">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/kn/torbutton.dtd b/kn/torbutton.dtd
index 1dd4edf..4b67aa1 100644
--- a/kn/torbutton.dtd
+++ b/kn/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "à²?à³?à²ªà³?à²¯à²¤à³? à²¸à³?à²?à³?à²?à²¿à²?à²?à³?à²?à²³à³?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à²¸à³?à²°à²?à³?à²·à²¤à²¾ à²®à²?à³?à²?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "à²?à²¡à²¿à²®à³? (à²¡à²¿à³?à²«à²¾à²²à³?à²?à³?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "à²®à²§à³?à²¯à²®-à²¹à³?à²?à³?à²?à³?">
diff --git a/ko/torbutton.dtd b/ko/torbutton.dtd
index 3309f41..23392d1 100644
--- a/ko/torbutton.dtd
+++ b/ko/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ ë³´í?¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ë¥¼ ë³´í?¸í??ì§? ì??ì??">
 <!ENTITY torbutton.prefs.priv_caption "ê°?ì?¸ ì ?ë³´ ì?¤ì ?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "ë¸?ë?¼ì?°ì§? í??ì?¤í? ë¦¬ë?? ì?¹ì?¬ì?´í?¸ ë?°ì?´í?°ë¥¼ ê¸°ë¡?í??ì§? ë§?ì?ì??ì?¤ (Private Browsing ëª¨ë?? í??ì?±í??)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ì ? 3ì?? ì¿ í?¤ì?? ë?¤ë¥¸ ì¶?ì ? ë?°ì?´í?° ì ?í??">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "ë¸?ë?¼ì?°ì ? í??ë?¬ê·¸ì?¸ ë¹?í??ì?±í?? (ì?? : í??ë??ì??)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ë?¤ë¥¸ Tor browser ì?¬ì?©ì??ë¡?ë¶?í?° êµ¬ë³?ë??ë?? ì?¸ë¶? ì?¬í? ë³?ê²½">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "ë³´ì?? ë?±ê¸?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "ë?®ì?? (ê¸°ë³¸)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline (ë² ì?´ì?¤ë?¼ì?¸) JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "ì?¼ë¶? ì?¬ì?´í?¸ì?? ì?¤í?¬ë¦½í?¸ ë??ì??ì?´ ë??ë ¤ì§? ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathMLê°? ë¹?í??ì?±í?? ë??ì??ì?µë??ë?¤.">
 <!ENTITY torbutton.prefs.sec_med_high "ì¤?ê°? ë??ì??">
diff --git a/ko_KR/torbutton.dtd b/ko_KR/torbutton.dtd
index 05ed704..548c52a 100644
--- a/ko_KR/torbutton.dtd
+++ b/ko_KR/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ku/torbutton.dtd b/ku/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ku/torbutton.dtd
+++ b/ku/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ku_IQ/torbutton.dtd b/ku_IQ/torbutton.dtd
index 50ebcdb..7629113 100644
--- a/ku_IQ/torbutton.dtd
+++ b/ku_IQ/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/kw/torbutton.dtd b/kw/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/kw/torbutton.dtd
+++ b/kw/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ky/torbutton.dtd b/ky/torbutton.dtd
index 82e3074..1d9bea7 100644
--- a/ky/torbutton.dtd
+++ b/ky/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/la/torbutton.dtd b/la/torbutton.dtd
index e926857..0158c12 100644
--- a/la/torbutton.dtd
+++ b/la/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Verba nova informationis protegere">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Verba nova informationis non protegere">
 <!ENTITY torbutton.prefs.priv_caption "Praeferentiae abdititudinis">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Historiam navigandi et informationem paginarum non memorare (modum navigandi abditi init)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Non liceant verba informationis partis tertiae et informatio pro insecutione alia">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Additiones navis (ut Flash) defacere">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Minutalia mutare, quis non ut usatores alii Tor navis es">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Gradus certitudinis">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Infer (initiale)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Id paginas usabilissimas dat.">
 <!ENTITY torbutton.prefs.sec_low_desc "In eo grado certitudinis omnes possibilitates navis adsunt.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Programmata in nonnullis paginis lentior agere possunt.">
-<!ENTITY torbutton.prefs.sec_jar_desc "JAR programmata in remoto accepti non sunt.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR programmata rarissima in Coniunctione sunt, sed fons XSS temptationumque aliarum esse possunt.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Nonnulla possibilitates ostendationis formarum mathematicarum desunt.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML deest.">
 <!ENTITY torbutton.prefs.sec_med_high "Medio-Super">
diff --git a/lb/torbutton.dtd b/lb/torbutton.dtd
index c1c1e7d..d69d268 100644
--- a/lb/torbutton.dtd
+++ b/lb/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "PrivatsphÃ¤rastellungen">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "SÃ©cherheetslevel">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Niddreg (Standard)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "Bei dÃ«sem SÃ©cherheetslevel sinn all Browser features aktivÃ©iert.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ass ofgeschalt.">
 <!ENTITY torbutton.prefs.sec_med_high "Net-Ganz-HÃ©ich">
diff --git a/lg/torbutton.dtd b/lg/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/lg/torbutton.dtd
+++ b/lg/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ln/torbutton.dtd b/ln/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ln/torbutton.dtd
+++ b/ln/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/lo/torbutton.dtd b/lo/torbutton.dtd
index e3988e8..26cb79d 100644
--- a/lo/torbutton.dtd
+++ b/lo/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "àº?àº²àº?àº?àº³àº?àº»àº?àº?à»?àº²àº?àº§àº²àº¡à»?àº?àº±àº?àºªà»?àº§àº?à»?àº?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "àº¥àº°àº?àº±àº?àº?àº§àº²àº¡àº?àºàº?à»?àº?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "àº?à»?à»?àº² (àº?àº²àº¡àº?à»?àº²à»?àº?àºµàº¡)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "àº?àºµà»?àº?àº°àºªàº°à»?àºàº?àº?àº°àºªàº»àº?àº?àº²àº?àº?àºµà»?àº¡àº±àº?à»?àº?à»?à»?àº¥àº·à»?àºàº?.">
 <!ENTITY torbutton.prefs.sec_low_desc "àº?àº§àº²àº¡àº?àºàº?à»?àº?àº¢àº¹à»?àº¥àº°àº?àº±àº?àº?àºµà»? àº?àº°àºàº°àº?àº¸àº?àº²àº?à»?àº«à»?àº?àº¸àº?à»?àº?àº·à»?àºàº?àº¡àº·à»?àº?à»?àº?àº²àº?à»?àº?à»?.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "àºªàº°àº?àº£àº´àº? àº¢àº¹à»?àº?àº²àº?à»?àº§àº±àº?à»?àº?àºàº²àº?à»?àº®àº±àº?àº§àº½àº?àº«àº¼àº·à»?àº¥à»?àº?àº?à»?àº²àº?àº§à»?àº².">
-<!ENTITY torbutton.prefs.sec_jar_desc "àº?àº²àº?àº¥à»? JAR à»?àº¥àº?àº°à»?àº?àº?àº·àº?àº?àº±àº?à»?àº§à»?">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "àº?àº²àº?àº¥à»? JAR àº«àº²à»?àº?à»?àº?àº²àº?à»?àº?à»?àº§àº±àº?, à»?àº?à»?àº¡àº±àº?àºªàº²àº¡àº²àº?à»?àº?àº±àº?à»?àº«àº¼à»?àº?àº?àºàº? XSS à»?àº¥àº° àº?àº²àº?à»?àº?àº¡àº?àºµàºàº·à»?àº?à»?.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "àº?àº»àº?à»?àº?àº?àº²àº?àºªà»?àº§àº?àº?àºàº?àº?àº²àº?àºªàº°à»?àº?àº?àºªàº»àº¡àº?àº»àº?àº?àº²àº?àº?àº°àº?àº´àº?àºªàº²àº?àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
 <!ENTITY torbutton.prefs.sec_med_high "àº?àº²àº?-àºªàº¹àº?">
diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd
index 0d7150c..ace5d48 100644
--- a/lt/torbutton.dtd
+++ b/lt/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Apsaugoti naujus slapukus">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neapsaugoti naujÅ³ slapukÅ³">
 <!ENTITY torbutton.prefs.priv_caption "Privatumo nustatymai">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "NeÄ¯raÅ¡inÄ?ti narÅ¡ymo Å¾urnalo ir svetainiÅ³ duomenÅ³ (Ä¯jungia privataus narÅ¡ymo veiksenÄ?)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Neleisti treÄ?iÅ³jÅ³ Å¡aliÅ³ slapukÅ³ ir kitÅ³ sekimo duomenÅ³">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "IÅ¡jungti narÅ¡yklÄ?s papildinius (tokius kaip Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Pakeisti informacijÄ?, kuri iÅ¡skiria jus iÅ¡ kitÅ³ Tor Browser naudotojÅ³">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Saugumo lygmuo">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Å½emas (numatytasis)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Tai suteikia didÅ¾iausiÄ? naudojimosi patogumÄ?.">
 <!ENTITY torbutton.prefs.sec_low_desc "Å iame saugumo lygmenyje, visos narÅ¡yklÄ?s ypatybÄ?s yra Ä¯jungtos.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Kai kuriose svetainÄ?se scenarijai gali bÅ«ti vykdomi lÄ?Ä?iau.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Nuotoliniai JAR failai yra uÅ¾blokuoti.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR failai tinkle labai reti, bet jie gali tapti XSS ir kitÅ³ atakÅ³ Å¡altiniu.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Kai kurie matematiniÅ³ lygÄ?iÅ³ atvaizdavimo mechanizmai iÅ¡jungti.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML yra iÅ¡jungtas.">
 <!ENTITY torbutton.prefs.sec_med_high "Vidutinis-AukÅ¡tas">
diff --git a/lv/torbutton.dtd b/lv/torbutton.dtd
index 31ddb9f..b2a5f35 100644
--- a/lv/torbutton.dtd
+++ b/lv/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "AizsargÄ?t jaunÄ?s sÄ«kdatnes">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NeaizsargÄ?t jaunÄ?s sÄ«kdatnes">
 <!ENTITY torbutton.prefs.priv_caption "PrivÄ?tuma iestatÄ«jumi">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "NereÄ£istrÄ?t pÄ?rlÅ«koÅ¡anas vÄ?sturi vai tÄ«mekÄ¼a vietÅ?u datus (iespÄ?jo PrivÄ?tas pÄ?rlÅ«koÅ¡anas reÅ¾Ä«mu)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "IerobeÅ¾ot treÅ¡o personu sÄ«kdatnes un citus izsekoÅ¡anas datus">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "AtspÄ?jot pÄ?rlÅ«ku spraudÅ?us (tÄ?dus kÄ? Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "MainÄ«t informÄ?ciju, kura dara JÅ«s atÅ¡Ä·irÄ«gus no citiem PÄ?rlÅ«ka Tor lietotÄ?jiem">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "DroÅ¡Ä«bas lÄ«menis">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Zems (noklusÄ?juma vÄ?rtÄ«ba)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Å Ä« iespÄ?ja sniedz visparocÄ«gÄ?ko iespÄ?ju.">
 <!ENTITY torbutton.prefs.sec_low_desc "Å ajÄ? droÅ¡Ä«bas lÄ«menÄ« ir iespÄ?jotas visas pÄ?rlÅ«ka iezÄ«mes. ">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, saskarne Type, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "BÄ?zlÄ«nijas JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "DaÅ¾Ä?s vietnÄ?s skripti tiks izpildÄ«ti lÄ?nÄ?k.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Tiek bloÄ·Ä?tas attÄ?linÄ?tas JAR datnes.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "TÄ«meklÄ« JAR datnes tiek lietotas reti, bet tÄ?s var bÅ«t XSS un citu uzbrukumu avots.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Ir atspÄ?joti daÅ¾i matemÄ?tisku vienÄ?dojumu attÄ?loÅ¡anas mehÄ?nismi.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "Ir atspÄ?jots MathML.">
 <!ENTITY torbutton.prefs.sec_med_high "VidÄ?ji augsts">
diff --git a/mg/torbutton.dtd b/mg/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/mg/torbutton.dtd
+++ b/mg/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/mi/torbutton.dtd b/mi/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/mi/torbutton.dtd
+++ b/mi/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/mk/torbutton.dtd b/mk/torbutton.dtd
index d043816..3670d6e 100644
--- a/mk/torbutton.dtd
+++ b/mk/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ml/torbutton.dtd b/ml/torbutton.dtd
index 3484369..d403e92 100644
--- a/ml/torbutton.dtd
+++ b/ml/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "à´¸àµ?à´µà´?à´¾à´°àµ?à´¯à´¤à´¾ à´?àµ?à´°à´®àµ?à´?à´°à´£à´?àµ?à´?àµ¾">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à´¸àµ?à´°à´?àµ?à´·à´¾ à´²àµ?à´µàµ½">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "à´²àµ?à´¾ (à´¸àµ?à´µà´¤à´µàµ?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "à´?à´¤àµ? à´?à´±àµ?à´±à´µàµ?à´? à´¸à´¹à´¾à´¯à´?à´®à´¾à´¯ à´?à´¨àµ?à´à´µà´? à´¨àµ½à´?àµ?à´¨àµ?à´¨àµ?.">
 <!ENTITY torbutton.prefs.sec_low_desc "à´? à´¸àµ?à´°à´?àµ?à´·à´¾ à´¤à´²à´¤àµ?à´¤à´¿àµ½, à´?à´²àµ?à´²à´¾ à´¬àµ?à´°àµ?àµ?à´¸àµ¼ à´¸à´µà´¿à´¶àµ?à´·à´¤à´?àµ¾ à´ªàµ?à´°à´¾à´ªàµ?à´¤à´®à´¾à´?àµ?à´?à´¿.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "à´?à´¯àµ?à´¾àµº à´?àµ?à´?à´?à´¿, à´?àµ?à´ªàµ?à´ªàµ? à´¨à´¿à´?à´®à´¨à´¤àµ?à´¤à´¿à´¨àµ?à´±àµ?, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline à´?àµ?à´?à´?à´¿.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "à´?à´¿à´² à´¸àµ?à´±àµ?à´±àµ?à´?à´³à´¿àµ½ à´¸àµ?à´?àµ?à´°à´¿à´ªàµ?à´±àµ?à´±àµ?à´?àµ¾ à´ªà´¤à´¿à´¯àµ? à´?àµ?à´¯àµ?à´¯à´¾à´µàµ?à´¨àµ?à´¨à´¤à´¾à´£àµ?.">
-<!ENTITY torbutton.prefs.sec_jar_desc "à´±à´¿à´®àµ?à´¾à´?àµ?à´?àµ? JAR à´«à´¯à´²àµ?à´?àµ¾ à´¤à´?à´?àµ?à´?àµ?.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "à´?àµ?à´?à´?àµ¼ à´«à´¯à´²àµ?à´?àµ¾ à´µàµ?à´¬à´¿àµ½ à´µà´³à´°àµ? à´µà´¿à´°à´³à´®à´¾à´£àµ?,à´ªà´?àµ?à´·àµ?, XSS à´®à´±àµ?à´±àµ? à´?à´?àµ?à´°à´®à´£à´?àµ?à´?à´³àµ? à´¨àµ½à´?àµ?à´?.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "à´?à´£à´¿à´¤ à´¸à´®à´µà´¾à´?àµ?à´¯à´?àµ?à´?àµ¾ à´ªàµ?à´°à´¦àµ¼à´¶à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´¿à´² à´?à´µà´¯à´¿à´²àµ?à´¾à´¨àµ?à´¨à´¾à´£àµ? à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¨à´°à´¹à´¿à´¤à´®à´¾à´£àµ?.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¨à´°à´¹à´¿à´¤à´®à´¾à´?àµ?à´?à´¿.">
 <!ENTITY torbutton.prefs.sec_med_high "à´?à´?à´¤àµ?à´¤à´°à´?-à´¹àµ?">
diff --git a/mn/torbutton.dtd b/mn/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/mn/torbutton.dtd
+++ b/mn/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/mr/torbutton.dtd b/mr/torbutton.dtd
index 45a087f..5a278c7 100644
--- a/mr/torbutton.dtd
+++ b/mr/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "à¤?à¥?à¤ªà¤¨à¥?à¤¯à¤¤à¤¾ à¤¸à¥?à¤?à¤¿à¤?à¤?à¥?à¤?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à¤¸à¥?à¤°à¤?à¥?à¤·à¤¾ à¤¸à¥?à¤¤à¤°">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "à¤?à¤®à¥? (à¤¡à¥?à¤«à¥?à¤²à¥?à¤?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "à¤®à¤§à¥?à¤¯à¤®-à¤?à¤?à¥?à¤?">
diff --git a/ms_MY/torbutton.dtd b/ms_MY/torbutton.dtd
index 28845b8..027e613 100644
--- a/ms_MY/torbutton.dtd
+++ b/ms_MY/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Lindungi Cookies Baru">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Jangan Melindungi Cookies Baru">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Matikan pelayar plugin (seperti Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ubah butir-butir yang membezakan anda daripada pengguna lain Pelayar Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/mt/torbutton.dtd b/mt/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/mt/torbutton.dtd
+++ b/mt/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/my/torbutton.dtd b/my/torbutton.dtd
index f9cd96d..2e1c6e2 100644
--- a/my/torbutton.dtd
+++ b/my/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¬á??á?½á??á?ºá??á??á?º">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¬á??á?½á??á?ºá??á?¼á??á?ºá?¸ á??á??á?¼á?¯á??á??á?º">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "á??á?¯á?¶á??á?¼á?¯á?¶â??á??á?±á?¸á?¡á??á??á?ºá?·">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "á?¤á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¸á?¡á??á??á?ºá?·á??á?½á??á?º Browser á??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?»á??á?ºá?¡á?¬á?¸á??á?¯á?¶á?¸á??á?á?¯ á??á?½á??á?ºá?·á??á?¼á?¯á??á?¬á?¸á??á?«á??á??á?ºá??">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/nah/torbutton.dtd b/nah/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/nah/torbutton.dtd
+++ b/nah/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/nap/torbutton.dtd b/nap/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/nap/torbutton.dtd
+++ b/nap/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/nb/torbutton.dtd b/nb/torbutton.dtd
index eea720c..483d089 100644
--- a/nb/torbutton.dtd
+++ b/nb/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt nye informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke beskytt nye informasjonskapsler">
 <!ENTITY torbutton.prefs.priv_caption "Personvernsinnstillinger">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleserÃ¸kt)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata.">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Skru av nettlesertillegg (som f.eks Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre brukere av Tor-nettleseren.">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "SikkerhetsnivÃ¥">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Lav (forvalg)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Dette gir den mest brukbare opplevelsen.">
 <!ENTITY torbutton.prefs.sec_low_desc "PÃ¥ dette sikkerhetsnivÃ¥et er alle nettleser-funksjoner pÃ¥skrudd.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript pÃ¥ noen sider kan kjÃ¸re saktere.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Eksterne JAR-filer blokkert.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR filer er svÃ¦rt sjeldne pÃ¥ nett, men kan vÃ¦re en kilde til XSS og andre angrep.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Noen mekanismer for Ã¥ vise matteformler er skrudd av.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML er avskrudd.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-hÃ¸y">
diff --git a/nds/torbutton.dtd b/nds/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/nds/torbutton.dtd
+++ b/nds/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ne/torbutton.dtd b/ne/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ne/torbutton.dtd
+++ b/ne/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index aae68f5..c9fff3a 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe Cookies niet">
 <!ENTITY torbutton.prefs.priv_caption "Privacyinstellingen">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Bewaar geen surfgeschiedenis of websitegegevens. (Schakelt PrivÃ©navigatie in.)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Schakel browserplug-ins uit (zoals Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Laag (standaard)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Dit verschaft de meest bruikbare ervaring">
 <!ENTITY torbutton.prefs.sec_low_desc "Op dit beveiligingsniveau worden alle browserfuncties ingeschakeld.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts kunnen op sommige websites trager zijn.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Externe JAR bestanden worden geblokkeerd.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-bestanden zijn uiterst zeldzaam op het web, maar kan een bron van XSS en andere attacks">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Sommige mechanismen van het weergeven van wiskundige vergelijkingen zijn uitgeschakeld.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is uitgeschakeld.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-Hoog">
diff --git a/nl_BE/torbutton.dtd b/nl_BE/torbutton.dtd
index 6ee1de4..f5a3770 100644
--- a/nl_BE/torbutton.dtd
+++ b/nl_BE/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/nn/torbutton.dtd b/nn/torbutton.dtd
index ee98c93..2e1a333 100644
--- a/nn/torbutton.dtd
+++ b/nn/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Personverninnstillingar">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "TryggingsnivÃ¥">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "LÃ¥g (standard)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-hÃ¸g">
diff --git a/nso/torbutton.dtd b/nso/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/nso/torbutton.dtd
+++ b/nso/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/oc/torbutton.dtd b/oc/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/oc/torbutton.dtd
+++ b/oc/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/om/torbutton.dtd b/om/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/om/torbutton.dtd
+++ b/om/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/or/torbutton.dtd b/or/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/or/torbutton.dtd
+++ b/or/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/pa/torbutton.dtd b/pa/torbutton.dtd
index 31fdec7..b550fa4 100644
--- a/pa/torbutton.dtd
+++ b/pa/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "à¨ªà¨°à¨¾à¨?à¨µà©?à¨¸à©? à¨¸à©?à¨?à¨¿à©°à¨?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/pap/torbutton.dtd b/pap/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/pap/torbutton.dtd
+++ b/pap/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/pl/torbutton.dtd b/pl/torbutton.dtd
index 0f3a905..38d84ac 100644
--- a/pl/torbutton.dtd
+++ b/pl/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ChroÅ? nowe ciasteczka">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nie chroÅ? nowych ciasteczek">
 <!ENTITY torbutton.prefs.priv_caption "Ustawienia PrywatnoÅ?ci">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Nie zapisuj historii przeglÄ?dania i danych o stronach (wÅ?Ä?cza Tryb Prywatny)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane sÅ?uÅ¼Ä?ce do Å?ledzenia">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "WyÅ?Ä?cz wtyczki przeglÄ?darki (takie jak Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ZmieÅ? szczegÃ³Å?y odrÃ³Å¼niajÄ?ce CiÄ? od innych uÅ¼ytkownikÃ³w PrzeglÄ?darki Tora">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeÅ?stwa">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Niski (domyÅ?lny)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "To zapewnia najbardziej przyjazdne dla uÅ¼ytkownika ustawienia.">
 <!ENTITY torbutton.prefs.sec_low_desc "Na tym poziomie zabezpieczeÅ?, wszystkie funkcje przeglÄ?darki sÄ? wÅ?Ä?czone.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skrypty na niektÃ³rych stronach mogÄ? dziaÅ?aÄ? wolniej.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Zdalne pliki JAR sÄ? blokowane.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Pliki JAR sÄ? bardzo rzadkim typem plikÃ³w w internecie. MogÄ? byÄ? one ÅºrÃ³dÅ?em atakÃ³w XSS i  innych.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "NiektÃ³re mechanizmy wyÅ?wietlania rÃ³wnaÅ? matematycznych sÄ? wyÅ?Ä?czone.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML jest wyÅ?Ä?czony.">
 <!ENTITY torbutton.prefs.sec_med_high "Å?redni-Wysoki">
diff --git a/pms/torbutton.dtd b/pms/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/pms/torbutton.dtd
+++ b/pms/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ps/torbutton.dtd b/ps/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ps/torbutton.dtd
+++ b/ps/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd
index 953bf7e..d5e141c 100644
--- a/pt/torbutton.dtd
+++ b/pt/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o Proteger Novos Cookies">
 <!ENTITY torbutton.prefs.priv_caption "ConfiguraÃ§Ãµes de Privacidade">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou os dados do site da Web (ativa o Modo de NavegaÃ§Ã£o Privado)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Desativar extensÃµes de navegador (tal como Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que o diferencia dos outros utilizadores do Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "NÃvel de SeguranÃ§a">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Baixo (predefiniÃ§Ã£o)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Isto proporciona a melhor experiÃªncia usÃ¡vel.">
 <!ENTITY torbutton.prefs.sec_low_desc "Neste nÃvel de seguranÃ§a, as funÃ§Ãµes do navegador estÃ£o ativadas.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de base JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sites poderÃ£o funcionar muito lentamente.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Os ficheiros JAR remotos estÃ£o bloqueados.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Os ficheiros JAR sÃ£o extremamente raros na Web, mas podem ser uma fonte de XSS e outros ataques.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos de visualizaÃ§Ã£o de equaÃ§Ãµes matemÃ¡ticas estÃ£o desativados.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML estÃ¡ desativado.">
 <!ENTITY torbutton.prefs.sec_med_high "MÃ©dio-Alto">
diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index 4091c3f..a035483 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o Proteger Novos Cookies">
 <!ENTITY torbutton.prefs.priv_caption "ConfiguraÃ§Ãµes de Privacidade">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou dados do website (permite NavegaÃ§Ã£o em Modo Privado)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Desabilitar plugins do navegador (como o Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes  que distinguem vocÃª de outros usuÃ¡rios do Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "NÃvel de SeguranÃ§a">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Baixo (padrÃ£o)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Isto proporciona a experiÃªncia mais utilizÃ¡vel.">
 <!ENTITY torbutton.prefs.sec_low_desc "Nesse nÃvel de seguranÃ§a, todas as funÃ§Ãµes do navegador sÃ£o ativadas. ">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Tipo de InferÃªncia, ASM JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de Base JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts podem rodar mais devagar em alguns sites.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Arquivos remotos JAR estÃ£o bloqueados.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Arquivos JAR sÃ£o extremamente raros na rede e podem uma fonte de XSS e de outros ataques.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos para mostrar equaÃ§Ãµes matemÃ¡ticas estÃ£o desabilitados.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML foi desabilitado.">
 <!ENTITY torbutton.prefs.sec_med_high "MÃ©dio-Alto">
diff --git a/ro/torbutton.dtd b/ro/torbutton.dtd
index 06e64e4..7b8321f 100644
--- a/ro/torbutton.dtd
+++ b/ro/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi">
 <!ENTITY torbutton.prefs.priv_caption "ConfigurÄ?ri de intimitate">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Nivel securitate">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "ScÄ?zut (implicit)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Aceasta asigurÄ? cea mai utilizabilÄ? experienÈ?Ä?.">
 <!ENTITY torbutton.prefs.sec_low_desc "La acest nivel de securitate, toate funcÈ?iile navigatorului sunt activate.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripturile pe unele site-uri poate rula Ã®ncet.">
-<!ENTITY torbutton.prefs.sec_jar_desc "FiÈ?ierele JAR distante sunt blocate.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "FiÈ?ierele JAR sunt extrem de rare pe web, dar pot fi o sursÄ? de XSS È?i alte atacuri.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Anumite mecanisme de afiÈ?are ecuaÈ?ii matematice sunt dezactivate.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML este dezactivat.">
 <!ENTITY torbutton.prefs.sec_med_high "Mediu-Ã®nalt">
diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd
index 9f1bbf2..016342c 100644
--- a/ru/torbutton.dtd
+++ b/ru/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ?">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ?">
 <!ENTITY torbutton.prefs.priv_caption "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ ÐºÐ¾Ð½Ñ?Ð¸Ð´ÐµÐ½Ñ?Ð¸Ð°Ð»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ð?Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ñ?Ð¸Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐµÐ½Ð¸Ð¹ Ð¸ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ? Ð¿Ð¾Ñ?ÐµÑ?Ð°ÐµÐ¼Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð¾Ð² (Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ñ?ÐµÑ? Ñ?Ñ?Ð½ÐºÑ?Ð¸Ñ? ÐºÐ¾Ð½Ñ?Ð¸Ð´ÐµÐ½Ñ?Ð¸Ð°Ð»Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð°)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ð¸Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ? Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ð»ÐµÐ¶ÐµÐ½Ð¸Ñ?">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½Ð¸Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° (Ñ?Ð°ÐºÐ¸Ðµ ÐºÐ°Ðº Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ?, Ð¾Ñ?Ð»Ð¸Ñ?Ð°Ñ?Ñ?Ð¸Ðµ Ð²Ð°Ñ? Ð¾Ñ? Ð´Ñ?Ñ?Ð³Ð¸Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¹ Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ð£Ñ?Ð¾Ð²ÐµÐ½Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Ð?Ð¸Ð·ÐºÐ¸Ð¹ (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ð?Ð°Ð¸Ð±Ð¾Ð»ÐµÐµ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ?.">
 <!ENTITY torbutton.prefs.sec_low_desc "Ð?Ð° Ñ?Ñ?Ð¾Ð¼ Ñ?Ñ?Ð¾Ð²Ð½Ðµ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸, Ð²Ñ?Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Ð?Ð°Ð·Ð¾Ð²Ñ?Ð¹ JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Ð¡Ñ?ÐµÐ½Ð°Ñ?Ð¸Ð¸ Ð½Ð° Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð°Ñ? Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð¼ÐµÐ´Ð»ÐµÐ½Ð½ÐµÐµ.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Ð¡Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ð¸Ðµ JAR Ñ?Ð°Ð¹Ð»Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ñ?.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR Ñ?Ð°Ð¹Ð»Ñ? ÐºÑ?Ð°Ð¹Ð½Ðµ Ñ?ÐµÐ´ÐºÐ¸ Ð² Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ðµ, Ð½Ð¾ Ð¼Ð¾Ð³Ñ?Ñ? Ð±Ñ?Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸ÐºÐ¾Ð¼ XSS Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ñ? Ð°Ñ?Ð°Ðº.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¼Ð°Ñ?ÐµÐ¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ñ? Ñ?Ñ?Ð°Ð²Ð½ÐµÐ½Ð¸Ð¹ Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½.">
 <!ENTITY torbutton.prefs.sec_med_high "Ð£Ð¼ÐµÑ?ÐµÐ½Ð½Ð¾ Ð²Ñ?Ñ?Ð¾ÐºÐ¸Ð¹">
diff --git a/ru@petr1708/torbutton.dtd b/ru@petr1708/torbutton.dtd
index aee6cf2..be2c9b9 100644
--- a/ru@petr1708/torbutton.dtd
+++ b/ru@petr1708/torbutton.dtd
@@ -34,11 +34,17 @@
 
  Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ð?Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ñ? Ð¾Ð±Ð¾Ð·Ñ?Ñ£Ð²Ð°Ñ?ÐµÐ»Ñ? Ð¸ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ? Ð¿Ð¾Ñ?Ñ£Ñ?Ð°ÐµÐ¼Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ñ? (Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ñ?ÐµÑ?Ñ? Ñ?Ñ?Ð½ÐºÑ?Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð°Ð³Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð°)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ñ?Ñ? ÐºÑ?ÐºÐ¸ Ð¸ Ð´Ñ?Ñ?Ð³Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ð»Ñ£Ð¶ÐµÐ½Ñ?Ñ?">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° (Ñ?Ð°ÐºÑ?Ðµ ÐºÐ°ÐºÑ? Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ð?Ð·Ð¼Ñ£Ð½Ð¸Ñ?Ñ? Ñ?Ð²Ñ£Ð´Ñ£Ð½Ñ?Ñ?, Ð¾Ñ?Ð»Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ñ? Ð¾Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¸Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¹ Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -51,8 +57,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/scn/torbutton.dtd b/scn/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/scn/torbutton.dtd
+++ b/scn/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/sco/torbutton.dtd b/sco/torbutton.dtd
index 2e7658d..3848f6f 100644
--- a/sco/torbutton.dtd
+++ b/sco/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Fend New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Dinna Fend New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Dinna record brousin histerie or wabsteid data (enables Preevate Brousin Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third pairtie cookies n ither trackin data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable brouser plugins (lyk Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish ye fae ither Tor Brouser uisers">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/si_LK/torbutton.dtd b/si_LK/torbutton.dtd
index 0557e4b..88bfb54 100644
--- a/si_LK/torbutton.dtd
+++ b/si_LK/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "à¶±à·? à¶?à·?à¶?à·? à¶?à¶»à¶?à·?à·?à·? à¶?à¶»à¶±à·?à¶±">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "à¶±à·? à¶?à·?à¶?à·? à¶?à¶»à¶?à·?à·?à·? à¶±à·?à¶?à¶»à¶±à·?à¶±">
 <!ENTITY torbutton.prefs.priv_caption "à¶´à·?à¶¯à·?à¶?à¶½à·?à¶? à·?à·?à¶§à·?à·?à¶¸à·? ">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "à·?à·?à·?à·?à¶¸à·? à¶?à¶à·?à·?à·?à·?à¶º à·?à·? à·?à·?à¶¶à·?à¶?à¶©à·?à·? à¶¯à¶à·?à¶ à·?à·?à¶»à·?à¶à·? à¶±à·?à¶?à¶»à¶±à·?à¶± (à¶´à·?à¶¯à·?à¶?à¶½à·?à¶? à·?à·?à·?à·?à¶¸à·? à¶¸à·?à¶°à·?â??à¶º à¶?à·?â??à¶»à·?à¶ºà·?à¶à·?à¶¸à¶? à¶?à¶»à¶ºà·?)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "à¶à·?à·?à¶± à¶´à·?à¶»à·?à·?à·? à¶?à·?à¶?à·? à·?à·? à¶?à¶±à·?à¶?à·? à¶?à·?à¶ºà·?à¶±à·?à·?à¶»à¶« à¶¯à¶à·?à¶ à¶?à¶à·?à·?à·?à¶§à·?à·?à¶±à·?à¶±">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "à¶¶à·?â??à¶»à·?à·?à·?à¶» à¶´à·?à¶±à·? à¶¸à·?à¶¯à·?à¶?à·?à¶?à¶? à¶?à¶?à·?â??à¶»à·?à¶º à¶?à¶»à¶±à·?à¶± (à·?à·?à¶½à·?à·?à·? à·?à·?à¶±à·?)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "à¶?à¶±à·?à¶à·? Tor à¶¶à·?â??à¶»à·?à·?à·?à¶» à¶·à·?à·?à·?à¶à·? à¶?à¶»à¶±à·?à¶±à¶±à·?à¶?à·?à¶±à·? à¶?à¶¶ à·?à·?à¶±à·? à¶?à¶» à·?à¶¯à·?à¶±à·?à¶?à¶±à·?à¶±à·? à·?à·?à·?à·?à¶à¶» à·?à·?à¶±à·?à·? à¶?à¶»à¶±à·?à¶±">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/sk/torbutton.dtd b/sk/torbutton.dtd
index 5d44386..8744482 100644
--- a/sk/torbutton.dtd
+++ b/sk/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Nastavenia SÃºkromia">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Level BezpeÄ?nosti">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "NÃzky (pÃ´vodnÃ©)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Toto nastavenie poskytne najpouÅ¾iteÄ¾nejÅ¡iu skÃºsenosÅ¥.">
 <!ENTITY torbutton.prefs.sec_low_desc "Na tomto leveli bezpeÄ?nosti, vÅ¡etky vlastnosti prehliadaÄ?a sÃº zapnutÃ©.
@@ -44,8 +50,6 @@ Press TAB to Save and go to next string">
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML je vypnutÃ½.">
 <!ENTITY torbutton.prefs.sec_med_high "StrednÃ½-VysokÃ½">
diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index fa4a414..b4e8d4f 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "OchrÃ¡niÅ¥ novÃ© Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NechrÃ¡niÅ¥ novÃ© Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Nastavenia sÃºkromia">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "NezaznamenÃ¡vaÅ¥ histÃ³riu prehliadania ani Ãºdaje strÃ¡nok (zapne mÃ³d SÃºkromnÃ©ho prehliadania)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ObmedziÅ¥ cookies tretÃch strÃ¡n a Ä?alÅ¡ie stopovacie Ãºdaje">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "ZakÃ¡zaÅ¥ prÃpojnÃ© moduly prehliadaÄ?a (napr. Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ZmeniÅ¥ detaily, ktorÃ© vÃ¡s odliÅ¡ujÃº od ostatnÃ½ch uÅ¾ÃvateÄ¾ov Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "BezpeÄ?nostnÃ¡ hladina">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "NÃzky (prednastavenÃ©)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "To poskytuje najpouÅ¾iteÄ¾nejÅ¡ie skÃºsenosti">
 <!ENTITY torbutton.prefs.sec_low_desc "Na tejto bezpeÄ?nostnej hladine, sÃº vÅ¡etky funkcie prehliadaÄ?a povolenÃ©.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, typovÃ¡ inferencia, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT zÃ¡klad.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skripty na niektorÃ½ch strÃ¡nkach mÃ´Å¾u beÅ¾aÅ¥ pomalÅ¡ie.">
-<!ENTITY torbutton.prefs.sec_jar_desc "VzdialenÃ© JAR sÃºbory sÃº zablokovanÃ©.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "SÃºbory JAR sÃº na internete veÄ¾mi vzÃ¡cne, ale mÃ´Å¾u byÅ¥ zdrojom XSS a inÃ½ch Ãºtokov.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "NiektorÃ© mechanizmy pre zobrazovanie matematickÃ½ch rovnÃc sÃº vypnutÃ©.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "Jazyk MathML je zakÃ¡zanÃ½.">
 <!ENTITY torbutton.prefs.sec_med_high "Stredne-vysokÃ½">
diff --git a/sl/torbutton.dtd b/sl/torbutton.dtd
index 4b22ef8..5ca5c0d 100644
--- a/sl/torbutton.dtd
+++ b/sl/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ne zaÅ¡Ä?iti novih piÅ¡kotkov">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/sl_SI/torbutton.dtd b/sl_SI/torbutton.dtd
index 8e32e24..c50e85b 100644
--- a/sl_SI/torbutton.dtd
+++ b/sl_SI/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ZaÅ¡Ä?iti Nove piÅ¡kotke">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne zaÅ¡Ä?iti Novih piÅ¡kotkov">
 <!ENTITY torbutton.prefs.priv_caption "Nastavitve zasebnosti">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ne zapisuj zgodovine brskanja ali podatke strani ( omogoÄ?eno zasebno brskanje)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Omeji piÅ¡kotke tretjih oseb in druge podatke o sledenju">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "OnemogoÄ?i vtiÄ?nike brskalnika ( kot Flash )">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Spremeni podatke, ki vas loÄ?ijo od drugih uporabnikov Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Varnostni nivo">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Nizek (privzeto)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "To zagotavlja najbolj uporabno izkuÅ¡njo.">
 <!ENTITY torbutton.prefs.sec_low_desc "Na tem varnostnem nivoju, so vse funkcije brskalnika omogoÄ?ene.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skripte na nekaterih straneh mogoÄ?e delujejo poÄ?asneje.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Daljinske JAR datoteke so blokirane">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR datoteke so zelo redke na spletu, ampak so lahko izvor XSS-a in ostalih napadov.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Nekaj mehanizmov prikazovanja matematiÄ?nih enaÄ?b je onemogoÄ?enih.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML je onemogoÄ?en.">
 <!ENTITY torbutton.prefs.sec_med_high "Srednji - Visok">
diff --git a/sn/torbutton.dtd b/sn/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/sn/torbutton.dtd
+++ b/sn/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/so/torbutton.dtd b/so/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/so/torbutton.dtd
+++ b/so/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/son/torbutton.dtd b/son/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/son/torbutton.dtd
+++ b/son/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd
index 8ea13a5..54be9a4 100644
--- a/sq/torbutton.dtd
+++ b/sq/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Mbrojini Cookie-t e Rinj">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Mos i Mbroni Cookie-t e Rinj">
 <!ENTITY torbutton.prefs.priv_caption "Parametrat e fshehtÃ«sisÃ«">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Mos regjistroni historinÃ« e kÃ«rkimit ose tÃ« dhÃ«nat e webfaqes (aktivizon MÃ«nyrÃ«n e Shfletimit Privatisht)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Kufizojini cookie-t e palÃ«ve tÃ« treta dhe tÃ« dhÃ«nat e tjera gjurmuese">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "PaaftÃ«soni shtojcat e shfletuesit (siÃ§ Ã«shtÃ« Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ndryshojini hollÃ«sitÃ« qÃ« ju dallojnÃ« nga pÃ«rdoruesit e tjerÃ« tÃ« Shfletuesit Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Niveli i sigurisÃ«">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "E ulÃ«t (me parazgjedhje)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Kjo ofron pÃ«rvojÃ«n mÃ« tÃ« pÃ«rdorshme.">
 <!ENTITY torbutton.prefs.sec_low_desc "NÃ« kÃ«tÃ« nivel sigurie, janÃ« aftÃ«suar tÃ« gjitha tiparet e shfletuesit.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, &quot;Type Inference&quot;, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baza JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skriptet nÃ« disa webfaqe mund tÃ« ekzekutohen mÃ« ngadalÃ«.">
-<!ENTITY torbutton.prefs.sec_jar_desc "SkedarÃ«t e largÃ«t JAR janÃ« penguar.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "SkedarÃ«t JAR janÃ« skajshÃ«m tÃ« rralla nÃ« web, por mund tÃ« jenÃ« njÃ« burim i XSS ose i tÃ« tjera sulmeve.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Disa mekanizma tÃ« shfaqjes sÃ« ekuacioneve matematike janÃ« paaftÃ«suar.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ã«shtÃ« paaftÃ«suar.">
 <!ENTITY torbutton.prefs.sec_med_high "Mesatare-E lartÃ«">
diff --git a/sr/torbutton.dtd b/sr/torbutton.dtd
index ae9eabe..cecadd3 100644
--- a/sr/torbutton.dtd
+++ b/sr/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?Ð°Ñ?Ñ?Ð¸Ñ?Ð¸ Ð½Ð¾Ð²Ðµ ÐºÐ¾Ð»Ð°Ñ?Ð¸Ñ?Ðµ">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?Ðµ Ñ?Ñ?Ð¸Ñ?Ð¸ Ð½Ð¾Ð²Ðµ ÐºÐ¾Ð»Ð°Ñ?Ð¸Ñ?Ðµ">
 <!ENTITY torbutton.prefs.priv_caption "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ne pamti moji istoriju pretrazivanja ili podatke sa web sajtova(Omogucava Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "OnemogucÌ?i dodatke pretrazivaca (kao Å¡to su Flash )">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Promenite detalje koji vas razlikuju od drugih korisnika Tor pretrazivaca.">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ð?Ð¸Ð²Ð¾ Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Ð?Ð¸Ð·Ð°Ðº (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Ð¡Ñ?ÐµÐ´Ñ?Ðµ-Ð²Ð¸Ñ?Ð¾Ðº">
diff --git a/sr@latin/torbutton.dtd b/sr@latin/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/sr@latin/torbutton.dtd
+++ b/sr@latin/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/st/torbutton.dtd b/st/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/st/torbutton.dtd
+++ b/st/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/su/torbutton.dtd b/su/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/su/torbutton.dtd
+++ b/su/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index 26f5d2a..781b692 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya kakor">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya kakor">
 <!ENTITY torbutton.prefs.priv_caption "SekretessinstÃ¤llningar">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Spara ingen historik eller webbplatsdata (aktiverar privat surfning)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "BegrÃ¤nsa tredjepartskakor och annan tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Inaktivera insticksmoduler (sÃ¥ som Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ã?ndra detailjer som utmÃ¤rker dig ifrÃ¥n andra Tor Browser anvÃ¤ndare">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "SÃ¤kerhetsnivÃ¥">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "LÃ¥g (fÃ¶rvald)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Detta skapar den mest anvÃ¤ndbara upplevelsen.">
 <!ENTITY torbutton.prefs.sec_low_desc "PÃ¥ den hÃ¤r sÃ¤kerhetsnivÃ¥n Ã¤r webblÃ¤sarens alla funktioner aktiverade.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript pÃ¥ vissa webbsidor kan gÃ¥ lÃ¥ngsammare.">
-<!ENTITY torbutton.prefs.sec_jar_desc "JAR-filer blockeras.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-filer Ã¤r extremt ovanliga pÃ¥ webben men kan innehÃ¥lla XSS och andra typer av attacker.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Vissa funktioner fÃ¶r att visa matematiska formler Ã¤r avaktiverade.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ã¤r inaktiverat.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-hÃ¶g">
diff --git a/sw/torbutton.dtd b/sw/torbutton.dtd
index 7e19bc7..3e6f06e 100644
--- a/sw/torbutton.dtd
+++ b/sw/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Zuia plugins za kisakuzi (kama vile Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Badilisha sifa zinazokutofautisha na wengine wanaotumia kisakuzi cha Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Kiwango cha Usalama">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Chini (chaguo-msingi)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "Katika kiwango hiki cha usalama, vipengele vyote vya kisakuzi vimewezeshwa">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/szl/torbutton.dtd b/szl/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/szl/torbutton.dtd
+++ b/szl/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ta/torbutton.dtd b/ta/torbutton.dtd
index 23c7121..0d16358 100644
--- a/ta/torbutton.dtd
+++ b/ta/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "à®¤à®©à®¿à®¯à¯?à®°à®¿à®®à¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à®¤à®©à®¿à®?à¯? à®¨à®¿à®²à¯?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "à®?à¯?à®±à¯?à®¨à¯?à®¤ (à®?à®¯à®²à¯?à®ªà¯?à®¨à®¿à®²à¯?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "à®¨à®?à¯?à®¤à¯?à®¤à®° à®?à®¯à®°à¯?">
diff --git a/te/torbutton.dtd b/te/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/te/torbutton.dtd
+++ b/te/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/te_IN/torbutton.dtd b/te_IN/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/te_IN/torbutton.dtd
+++ b/te_IN/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/tg/torbutton.dtd b/tg/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/tg/torbutton.dtd
+++ b/tg/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/th/torbutton.dtd b/th/torbutton.dtd
index 50cde14..c71f094 100644
--- a/th/torbutton.dtd
+++ b/th/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¸?à¸§à¸²à¸¡à¹?à¸?à¹?à¸?à¸ªà¹?à¸§à¸?à¸?à¸±à¸§">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à¸£à¸°à¸?à¸±à¸?à¸?à¸§à¸²à¸¡à¸?à¸¥à¸à¸?à¸ à¸±à¸¢">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "à¸?à¹?à¸³ (à¸?à¹?à¸²à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "à¸?à¸¥à¸²à¸?-à¸ªà¸¹à¸?">
diff --git a/ti/torbutton.dtd b/ti/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ti/torbutton.dtd
+++ b/ti/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/tk/torbutton.dtd b/tk/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/tk/torbutton.dtd
+++ b/tk/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index aade9cf..f551da1 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Ã?erezleri Koru">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Ã?erezleri Koruma">
 <!ENTITY torbutton.prefs.priv_caption "Gizlilik AyarlarÄ±">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Tarama geÃ§miÅ?ini ve web sitesi bilgileri kaydedilmesin (Gizli Tarama Kipi kullanÄ±lÄ±r)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf Ã§erez ve diÄ?er iz sÃ¼rÃ¼cÃ¼ bilgiler engellensin">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "TarayÄ±cÄ± eklentileri engellensin (Flash gibi)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "DiÄ?er Tor Browser kullanÄ±cÄ±larÄ±ndan sizi ayÄ±ran ayrÄ±ntÄ±lar deÄ?iÅ?tirilsin">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "GÃ¼venlik DÃ¼zeyi">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "DÃ¼Å?Ã¼k (varsayÄ±lan)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Bu seÃ§enek en kullanÄ±labilir deneyimi sunar.">
 <!ENTITY torbutton.prefs.sec_low_desc "Bu gÃ¼venlik dÃ¼zeyinde tÃ¼m tarayÄ±cÄ± Ã¶zellikleri kullanÄ±labilir.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "SÄ±nÄ±r Ã?izgi JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "BazÄ± sitelerde betikler daha yavaÅ? Ã§alÄ±Å?abilir.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Uzak JAR dosyalarÄ± engellenir.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR dosyalarÄ±na aÄ?da oldukÃ§a ender rastlanÄ±r, ancak XSS ve diÄ?er saldÄ±rÄ±larÄ±n kaynaÄ?Ä± olabilir.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini gÃ¶rÃ¼ntÃ¼leyen bazÄ± dÃ¼zenekler devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
 <!ENTITY torbutton.prefs.sec_med_high "Orta-YÃ¼ksek">
diff --git a/tzm/torbutton.dtd b/tzm/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/tzm/torbutton.dtd
+++ b/tzm/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ug@Arab/torbutton.dtd b/ug@Arab/torbutton.dtd
index caf75e5..a5ac63d 100644
--- a/ug@Arab/torbutton.dtd
+++ b/ug@Arab/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø®ØµÙ?ØµÙ?Ø©">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/uk/torbutton.dtd b/uk/torbutton.dtd
index 86a1b34..0e9eee3 100644
--- a/uk/torbutton.dtd
+++ b/uk/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð?Ð¾Ð²Ñ? Ð?Ñ?ÐºÐ¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?Ðµ Ð?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð?Ð¾Ð²Ñ? Ð?Ñ?ÐºÐ¸">
 <!ENTITY torbutton.prefs.priv_caption "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð?Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Ð?Ðµ Ð·Ð±ÐµÑ?Ñ?Ð³Ð°Ñ?Ð¸ Ñ?Ñ?Ñ?Ð¾Ñ?Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ñ?Ð² Ð°Ð±Ð¾ Ð´Ð°Ð½Ñ? Ð· Ð²Ñ?Ð´Ð²Ñ?Ð´Ñ?Ð²Ð°Ð½Ð¸Ñ? Ñ?Ð°Ð¹Ñ?Ñ?Ð² (Ð°ÐºÑ?Ð¸Ð²Ñ?Ñ? Ñ?Ñ?Ð½ÐºÑ?Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ñ?)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?Ð»Ð¾ÐºÑ?Ð²Ð°Ñ?Ð¸ Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ñ? ÐºÑ?ÐºÐ¸ Ñ?Ð° Ñ?Ð½Ñ?Ñ? Ð´Ð°Ð½Ñ? Ð²Ñ?Ð´Ñ?Ñ?ÐµÐ¶ÐµÐ½Ð½Ñ?">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Ñ?Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð½Ñ? Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ?Ð° (Ñ?Ð°ÐºÑ? Ñ?Ðº Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ð?Ð¼Ñ?Ð½Ð¸Ñ?Ð¸ Ð²Ñ?Ð´Ð¾Ð¼Ð¾Ñ?Ñ?Ñ?, Ñ?Ð¾ Ð²Ñ?Ð´Ñ?Ñ?Ð·Ð½Ñ?Ñ?Ñ?Ñ? Ð²Ð°Ñ? Ð²Ñ?Ð´ Ñ?Ð½Ñ?Ð¸Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð² Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ?Ð° Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ð Ñ?Ð²ÐµÐ½Ñ? Ð±ÐµÐ·Ð¿ÐµÐºÐ¸">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Ð?Ð¸Ð·Ñ?ÐºÐ¸Ð¹ (Ð¿Ð¾ Ð·Ð°Ð¼Ð¾Ð²Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ð?Ð°Ð¹Ð±Ñ?Ð»Ñ?Ñ? Ð·Ñ?Ñ?Ñ?Ð½Ð¸Ð¹ Ð²Ð°Ñ?Ñ?Ð°Ð½Ñ? Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ?.">
 <!ENTITY torbutton.prefs.sec_low_desc "Ð?Ð° Ñ?Ñ?Ð¾Ð¼Ñ? Ñ?Ñ?Ð²Ð½Ñ? Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, Ð²Ñ?Ñ? Ñ?Ñ?Ð½ÐºÑ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Ð?Ð°Ð·Ð¾Ð²Ð¸Ð¹ JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Ð¡ÐºÑ?Ð¸Ð¿Ñ?Ð¸ Ð½Ð° Ð´ÐµÑ?ÐºÐ¸Ñ? Ñ?Ð°Ð¹Ñ?Ð°Ñ? Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð»Ñ?Ð½Ñ?Ñ?Ðµ.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Ð¡Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ñ? JAR  Ñ?Ð°Ð¹Ð»Ð¸ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ñ?.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-Ñ?Ð°Ð¹Ð»Ð¸ Ð²ÐºÑ?Ð°Ð¹ Ñ?Ñ?Ð´ÐºÑ?Ñ?Ð½Ñ? Ð² Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ?, Ð°Ð»Ðµ Ð²Ð¾Ð½Ð¸ Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð±Ñ?Ñ?Ð¸ Ð´Ð¶ÐµÑ?ÐµÐ»Ð¾Ð¼ XSS Ñ?Ð° Ñ?Ð½Ñ?Ð¸Ñ? Ð°Ñ?Ð°Ðº.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Ð?ÐµÑ?ÐºÑ? Ð¼ÐµÑ?Ð°Ð½Ñ?Ð·Ð¼Ð¸ Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð¼Ð°Ñ?ÐµÐ¼Ð°Ñ?Ð¸Ñ?Ð½Ð¸Ñ? Ñ?Ñ?Ð²Ð½Ñ?Ð½Ñ? Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¹.">
 <!ENTITY torbutton.prefs.sec_med_high "Ð?Ð¸Ñ?Ðµ Ñ?ÐµÑ?ÐµÐ´Ð½Ñ?Ð¾Ð³Ð¾">
diff --git a/ur/torbutton.dtd b/ur/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ur/torbutton.dtd
+++ b/ur/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ur_PK/torbutton.dtd b/ur_PK/torbutton.dtd
index 3f5bb3e..5c8f88c 100644
--- a/ur_PK/torbutton.dtd
+++ b/ur_PK/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Ø®Ù?Ø¯Ú©Ø§Ø± JAR Ù?Ø§Ø¦Ù?Û?Úº Ø±Ú© Ú¯Ø¦Û? Û?Û?Úº">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/uz/torbutton.dtd b/uz/torbutton.dtd
index 106f5ec..6959be1 100644
--- a/uz/torbutton.dtd
+++ b/uz/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/ve/torbutton.dtd b/ve/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/ve/torbutton.dtd
+++ b/ve/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/vi/torbutton.dtd b/vi/torbutton.dtd
index d32c42b..2fc4b95 100644
--- a/vi/torbutton.dtd
+++ b/vi/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "CÃ i Ä?áº·t RiÃªng tÆ°">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Má»©c Ä?á»? Báº£o máºt">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Tháº¥p (máº·c Ä?á»?nh)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Ä?iá»?u nÃ y cung cáº¥p tráº£i nghiá»?m tiá»?n lá»£i nháº¥t">
 <!ENTITY torbutton.prefs.sec_low_desc "á»? má»©c nÃ y, táº¥t cáº£ tÃnh nÄ?ng cá»§a trÃ¬nh duyá»?t Ä?á»?u Ä?Æ°á»£c kÃch hoáº¡t.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/wa/torbutton.dtd b/wa/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/wa/torbutton.dtd
+++ b/wa/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/wo/torbutton.dtd b/wo/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/wo/torbutton.dtd
+++ b/wo/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd
index d54eda20..459cca4 100644
--- a/zh_CN/torbutton.dtd
+++ b/zh_CN/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?æ?¤æ?°ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?æ?¤æ?°ç?? Cookie">
 <!ENTITY torbutton.prefs.priv_caption "é??ç§?è®¾ç½®">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "ç¦?æ¢è®°å½?æµ?è§?å??å?²æ??ç½?ç«?æ?°æ?®ï¼?å?¯ç?¨é??ç§?æµ?è§?æ¨¡å¼?ï¼?">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?æ?°æ?®è·?è¸ªç¨?åº?">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "ç¦?ç?¨æµ?è§?å?¨æ??ä»¶ï¼?æ¯?å¦? Flashï¼?">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ä¿®æ?¹ Tor æµ?è§?å?¨ä¸å?¯å?ºå??ä½ ä¸?å?¶ä»? Tor ç?¨æ?·ç??ç»?è??ä¿¡æ?¯">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?çº§">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "ä½?ï¼?é»?è®¤ï¼?">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "è¯¥é??é¡¹å?¯æ??ä¾?æ??ä½³ç??ç?¨æ?·ä½?éª?ã??">
 <!ENTITY torbutton.prefs.sec_low_desc "è¯¥å®?å?¨çº§å?«å°?å?¯ç?¨æ??æ??æµ?è§?å?¨å??è?½ã??">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JITã??ç±»å??æ?¨æ?ã??ASM.JSã??">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JITã??">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "ä¸?äº?ç½?ç«?è??æ?¬å?¯è?½ä¼?æ??ç¼?æ?§è¡?ã??">
-<!ENTITY torbutton.prefs.sec_jar_desc "ç¦?ç?¨è¿?ç¨? JAR æ??ä»¶ã??">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "ç½?ç«?ä¸?å¾?å°?å?ºç?° JAR æ??ä»¶ï¼?ä½?å?¯è?½æ??ä¸º XSS å??å?¶ä»?æ?»å?»ç??æº?å¤´ã??">
 <!ENTITY torbutton.prefs.sec_mathml_desc "ç¦?ç?¨æ?°å¦æ?¹ç¨?å¼?ç??æ??äº?æ?¾ç¤ºæ?ºå?¶ã??">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "ç¦?ç?¨ MathMLã??">
 <!ENTITY torbutton.prefs.sec_med_high "ä¸é«?">
diff --git a/zh_HK/torbutton.dtd b/zh_HK/torbutton.dtd
index ee11887..16e07af 100644
--- a/zh_HK/torbutton.dtd
+++ b/zh_HK/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?è·æ?°å??Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "å??ä¿?è·æ?°å??Cookie">
 <!ENTITY torbutton.prefs.priv_caption "ç§?é?±è¨å®?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "å??è¨?é??ç??è¦½æ·ç¨?æ??ç¶²ç«?è³?æ??(å??ç?¨ç§?é?±ç??è¦½æ¨¡å¼?)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹Cookieå??å?¶ä»?è·?è¹¤è³?æ??">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "å??ç?¨ç??è¦½å?¨å¤?æ??(ä¾?å¦?Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "æ?´æ?¹å?¯å??å?¥ä½ å??å?¶ä»?Toræ´?è?¥è·¯ç?±ç??è¦½å?¨ç?¨æ?¶å??ç´°ç¯?è³?æ??">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?ç´?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "ä½?(é ?è¨)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "æ??ä¾?æ??å¯¦ç?¨å??ä½¿ç?¨ç¶?é©?ã??">
 <!ENTITY torbutton.prefs.sec_low_desc "æ¤å®?å?¨ç?ç´?ä¸?ï¼?å°?å??ç?¨å?¨é?¨ç??è¦½å?¨å??è?½ã??">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JITã??é¡?å??æ?¨æ?·ã??ASM.JSã??">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "å?ºæ?¬JITã??">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "æ??äº?ç¶²ç«?å??ç¨?å¼?ç¢¼æ??å?·è¡?å¾?è¼?æ?¢ã??">
-<!ENTITY torbutton.prefs.sec_jar_desc "å·²å°?é??é??è·?jaræª?æ¡?ã??">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "Jaræª?æ¡?å?ºç¶²çµ¡ä¸?é??å¸¸å°?è¦?ï¼?ä½?å?¯è?½æ??ç?ºXSSæ??å?¶ä»?æ?»æ??æ?¹å¼?å??ä¾?æº?ã??">
 <!ENTITY torbutton.prefs.sec_mathml_desc "å·²å??ç?¨é?¨ä»½é¡¯ç¤ºæ?¸å¸æ?¹ç¨?å¼?å??å??è?½ã??">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "å·²å??ç?¨MathMLã??">
 <!ENTITY torbutton.prefs.sec_med_high "ä¸é«?">
diff --git a/zh_TW/torbutton.dtd b/zh_TW/torbutton.dtd
index a7907e6..85201db 100644
--- a/zh_TW/torbutton.dtd
+++ b/zh_TW/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?è·æ?°ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?è·æ?°ç?? Cookie">
 <!ENTITY torbutton.prefs.priv_caption "é?±ç§?æ¬?è¨å®?">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "ä¸?è¨?é??ç??è¦½æ·ç¨?è¨?é??æ??ç¶²ç«?è³?æ??(å??ç?¨é?±ç§?ç??è¦½æ¨¡å¼?)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?è¿½è¹¤è³?æ??">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "å??ç?¨ç??è¦½å?¨å¤?æ??ç¨?å¼?(å¦? Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "è®?æ?´å?¯ä»¥å??å?¥æ?¨è??å?¶ä»?æ´?è?¥è·¯ç?±ç??è¦½å?¨ä½¿ç?¨è??ç??è©³ç´°è³?è¨?">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?ç´?">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "ä½?(é ?è¨)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "é??æ??ä¾?äº?æ??å¯¦ç?¨ç??ä½¿ç?¨ç¶?é©?">
 <!ENTITY torbutton.prefs.sec_low_desc "å?¨æ¤å®?å?¨å±¤ç´?ä¸?ï¼?æ??æ??ç??è¦½å?¨å??è?½é?½å°?å??ç?¨">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JITã??é¡?å??æ?¨å°?ã??ASM.JSã??">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "å?ºæ?¬ JITã??">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "è?³æ?¬å?¨æ??äº?ç¶²ç«?æ??å?·è¡?ç??æ¯?è¼?æ?¢">
-<!ENTITY torbutton.prefs.sec_jar_desc "é? ç«¯ JAR æª?æ¡?å·²è¢«å°?é??">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR æª?æ¡?å?¨ç¶²è·¯ä¸?é??å¸¸å°?è¦?ï¼?ä½?å¾?æ??å?¯è?½æ??ç?ºXSSæ??å?¶ä»?æ?»æ??æ?¹å¼?ç??ä¾?æº?">
 <!ENTITY torbutton.prefs.sec_mathml_desc "ä¸?äº?é¡¯ç¤ºæ?¸å¸æ?¹ç¨?å¼?ç??å??è?½å·²è¢«å??ç?¨">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML å·²å??ç?¨">
 <!ENTITY torbutton.prefs.sec_med_high "ä¸-é«?">
diff --git a/zu/torbutton.dtd b/zu/torbutton.dtd
index 4bca4c7..92b6eed 100644
--- a/zu/torbutton.dtd
+++ b/zu/torbutton.dtd
@@ -25,11 +25,17 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
 <!ENTITY torbutton.prefs.sec_low "Low (default)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
 <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
@@ -42,8 +48,6 @@
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
-<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked.">
-<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">

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

Prev by Author: [tor-commits] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed
Next by Author: [tor-commits] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed
Previous by thread: [tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
Next by thread: [tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
Index(es):
- Author
- Thread