[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: Mon, 18 Dec 2017 01:49:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 17 Dec 2017 20:49:42 -0500
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 5ab96b81923d538e99a0e8d6b0339c459c92461f
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Mon Dec 18 01:48:57 2017 +0000

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

diff --git a/ach/torbutton.dtd b/ach/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ach/torbutton.dtd
+++ b/ach/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ady/torbutton.dtd b/ady/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ady/torbutton.dtd
+++ b/ady/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/af/torbutton.dtd b/af/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/af/torbutton.dtd
+++ b/af/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ak/torbutton.dtd b/ak/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ak/torbutton.dtd
+++ b/ak/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/am/torbutton.dtd b/am/torbutton.dtd
index 269d81478..8c93b4fea 100644
--- a/am/torbutton.dtd
+++ b/am/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "á??á??á??á?? ">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ar/torbutton.dtd b/ar/torbutton.dtd
index db75c7a55..3de2586a7 100644
--- a/ar/torbutton.dtd
+++ b/ar/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "Ø·Ø¨Ù?Ø§Ù? Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ø³ØªÙ?Ù? Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø£Ù?Ø§Ù? Ø³Ù?Ù? Ù?ØªÙ? ØªÙ?Ø¹Ù?Ù? Ù?Ù? ØµÙ?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Ø¢Ù?Ù?Ø© ØªØ¬Ø³Ù?Ø¯ Ø§Ù?Ø®Ø· SVG OpenType Ù?Ø¹Ø·Ù?Ø©.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ø·Ø¨Ù?Ø§Ù? Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ø³ØªÙ?Ù? Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø£Ù?Ø§Ù? Ø³Ù?Ù? Ù?ØªÙ? ØªÙ?Ø¹Ù?Ù? Ù?Ø°Ù? Ø§Ù?ØªØºÙ?Ø±Ø§Øª ( Ù?Ù?Ø²Ù?Ø¯ Ù?Ù? Ø§Ù?ØªÙ?Ø§ØµÙ?Ù? Ù?Ø±Ø± Ø§Ù?Ù?Ø£Ø±Ø© Ù?Ù?Ù?)">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Ù?Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ù?Ù? Ø§Ù?Ù?Ù?Ù?Ù? Ø£Ù? ØªØØªØ§Ø¬ Ù?Ø¥Ø³ØªØ®Ø¯Ø§Ù? Ø²Ø± ØªØ¹Ø·Ù?Ù? Ø§Ù?Ø³Ù?Ø±Ù?Ø¨ØªØ§Øª Ù?Ù? Ø´Ø±Ø· Ø§Ù?Ø£Ø¯Ù?Ø§Øª Ù?ØªÙ?Ø¹Ù? Ø§Ù?Ù?ØØªÙ?Ù?Ø§Øª Ø§Ù?Ù?Ø±Ø¦Ù?Ø©.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Ø¨Ø¹Ø¶ Ù?ØØ³Ù?Ø§Øª Ù?ØµÙ?Øµ Ø§Ù?Ø¬Ø§Ù?Ø§ Ù?Ø¹Ø·Ù?Ø©">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Ø³Ù?Ø±Ø¨Øª Ù?Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ù?Ø¯ ØªØ¹Ù?Ù? Ø¨Ø´Ù?Ù? Ø¨Ø·Ù?Ø¦">
-<!ENTITY torbutton.prefs.sec_mathml_desc "Ø¨Ø¹Ø¶ Ø§Ù?Ø¢Ù?Ù?Ø§Øª Ù?Ø¹Ø±Ø¶ Ù?Ø¹Ø§Ø¯Ù?Ø§Øª Ø±Ù?Ø§Ø¶Ù?Ø© Ù?Ø¹Ø·Ù?Ø©.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Ù?Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?ØªÙ? ØªØ´ØºÙ? Ø¬Ø§Ù?Ø§ Ø³Ù?Ø±Ù?Ø¨ØªØ? Ù?Ù?Ù?Ù? ØªØ·Ù?Ù?Ø± Ø§Ù?Ø£Ø¯Ø§Ø¡ Ù?Ø¹Ø·Ù?.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Ø¨Ø¹Ø¶ Ù?Ù?Ø²Ø§Øª Ø¥Ø¸Ù?Ø§Ø± Ø§Ù?Ø®Ø·Ù?Ø· Ù?Ø¹Ø·Ù?Ø© ">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Ø¢Ù?Ù?Ø© ØªØ¬Ø³Ù?Ø¯ Ø§Ù?Ø®Ø· Graphite Ù?Ø¹Ø·Ù?Ø©.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Ø¨Ø¹Ø¶ Ø§Ù?Ø§Ù?Ù?Ø§Ø¹ Ù?Ù? Ø§Ù?ØµÙ?Ø± Ù?Ø¹Ø·Ù?Ù?">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Ø§Ù?ØµÙ?Ø± SVG Ù?Ø¹Ø·Ù?Ø©.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "ØªØ¹Ø·Ù?Ù? Ø¬Ø§Ù?Ø§ Ø³Ù?Ø±Ù?Ø¨Øª Ø§Ù?ØªØ±Ø§Ø¶Ù?Ø§ Ø¹Ù?Ù? Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ ØºÙ?Ø± HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Ù?Ù?Ù?Ù? ØªÙ?Ø¹Ù?Ù? Ø¬Ø§Ù?Ø§ Ø³Ù?Ø±Ù?Ø¨Øª ØØ³Ø¨ Ù?Ù? Ù?Ù?Ù?Ø¹ Ø¹Ù? Ø·Ø±Ù?Ù? Ø²Ø± ØªØ¹Ø·Ù?Ù? Ø§Ù?Ø³Ù?Ø±Ù?Ø¨ØªØ§Øª Ø§Ù?Ù?Ù?Ø¬Ù?Ø¯ Ø¹Ù?Ù? Ø´Ø±Ù?Ø· Ø§Ù?Ø£Ø¯Ù?Ø§Øª.">
-<!ENTITY torbutton.prefs.sec_high "Ø¹Ø§Ù?Ù?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "Ø¬Ø§Ù?Ø§ Ø³Ù?Ø±Ù?Ø¨Øª Ù?Ø¹Ø·Ù? Ø¨Ø´Ù?Ù? Ø§Ù?ØªØ±Ø§Ø¶Ù? Ø¹Ù?Ù? Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ø§Ù?Ø¹.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Ù?Ù? Ø§Ù?Ù?Ù?Ù?Ù? Ø£Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ø®Ø·Ù?Ø· Ù?Ø§Ù?Ø§Ù?Ù?Ù?Ù?Ø§Øª Ù?Ø¹Ø±Ù?Ø¶Ø© Ø®Ø·Ø£">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø®Ø· Ø§Ù?Ù?Ù?Ø¯Ù?Ø© Ù?Ù? Ø·Ø±Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© Ù?ØØ¸Ù?Ø±Ø©.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Ø¯Ø§Ø¦Ø±Ø© ØªÙ?Ø± Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ù?Ø¹">
diff --git a/arn/torbutton.dtd b/arn/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/arn/torbutton.dtd
+++ b/arn/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ast/torbutton.dtd b/ast/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ast/torbutton.dtd
+++ b/ast/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/az/torbutton.dtd b/az/torbutton.dtd
index 9390b519b..692e79d0d 100644
--- a/az/torbutton.dtd
+++ b/az/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "YuksÉ?k">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ba/torbutton.dtd b/ba/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ba/torbutton.dtd
+++ b/ba/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/be/torbutton.dtd b/be/torbutton.dtd
index 68cd0aef6..125d720db 100644
--- a/be/torbutton.dtd
+++ b/be/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Ð?Ð° Ñ?Ñ?Ñ?Ñ?Ð´Ð½Ñ?Ð¹ Ð°Ð´Ð»ÐµÐ³Ð»Ð°Ñ?Ñ?Ñ?">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/bg/torbutton.dtd b/bg/torbutton.dtd
index e7801963a..60b50ded9 100644
--- a/bg/torbutton.dtd
+++ b/bg/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ð?Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð°Ð·Ð¸ ÐºÑ?Ñ?Ð¸Ð¹ÐºÐ°, Ð·Ð° Ð´Ð° Ñ?ÐºÑ?Ð¸ÐµÑ?Ðµ Ð½ÐµÑ?Ð° Ð¾Ñ? Ñ?ÐµÐ±Ñ?Ð°Ð¹Ñ?Ð¾Ð²ÐµÑ?Ðµ, ÐºÐ¾Ð¸Ñ?Ð¾ Ñ?Ð° Ñ?Ð½Ð¸ÐºÐ°Ð»Ð½Ð¸ Ð·Ð° Ð²Ð°Ñ?, Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¾ Ð½Ð°Ñ?Ð¾Ð²Ð°Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ?Ð°, ÐºÐ°Ð»Ð²Ð¸Ñ?Ð½Ð¾Ñ?Ð¾ Ñ?Ð°Ð·Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°Ñ?Ñ?Ñ?Ð°Ñ?Ð°, ÐµÐ·Ð¸Ðº, Ð¼ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð½Ð¸ Ð´Ð¾Ð±Ð°Ð²ÐºÐ¸,  Ñ?Ð¿Ð¸Ñ?Ñ?ÐºÐ° Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð½Ð¸ Ð´Ð¾Ð±Ð°Ð²ÐºÐ¸, Ð¼Ñ?ÐµÐ¶Ð¾Ð²Ð¾ Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ, Ð¾Ñ?Ð¸ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ? Ð½Ð° ÐµÐºÑ?Ð°Ð½Ð°, Ñ?Ð°Ð·Ð¼ÐµÑ? Ð½Ð° ÐµÐºÑ?Ð°Ð½Ð°, Ð½Ð¸Ð²Ð¾ Ð½Ð° Ñ?Ð²ÐµÐ»Ð¸Ñ?ÐµÐ½Ð¸Ðµ Ð½Ð° Ñ?ÐµÐºÑ?Ñ?Ð° Ð·Ð° Ð¾Ñ?Ð´ÐµÐ»Ð½Ð¸Ñ?Ðµ Ñ?ÐµÐ±Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ðµ, Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸ Ñ?Ð¸Ð¿Ð¾Ð²Ðµ Ñ?Ð°Ð¹Ð»Ð¾Ð²Ðµ, Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð½Ð¸ Ñ?Ð²ÐµÑ?Ð¾Ð²Ðµ, Ð¸ WebGL Ð²Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ð¸.">
 <!ENTITY torbutton.prefs.sec_caption "Ð?Ð¸Ð²Ð¾ Ð½Ð° Ð·Ð°Ñ?Ð¸Ñ?Ð°">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Ð?Ð»Ñ?Ð·Ð³Ð°Ñ?Ð° Ð¿Ð¾ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ñ?Ð° Ñ?Ð°Ð·Ñ?ÐµÑ?Ð°Ð²Ð° Ð´Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð·Ð»Ð¸Ñ?Ð½Ð¸ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð½Ð° Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð°, ÐºÐ¾Ð¸Ñ?Ð¾ Ð¿Ñ?Ð°Ð²Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð° Ð¿Ð¾ Ð¿Ð¾Ð´Ð°Ñ?Ð»Ð¸Ð² Ð½Ð° Ð¾Ð¿Ð¸Ñ?Ð¸ Ð·Ð° Ñ?Ð°ÐºÐ²Ð°Ð½Ðµ.">
-<!ENTITY torbutton.prefs.sec_low "Ð?Ð¸Ñ?ÐºÐ¾ (Ð¿Ð¾ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "Ð¢Ð¾Ð²Ð° Ð¾Ñ?Ð¸Ð³Ñ?Ñ?Ñ?Ð²Ð° Ð½Ð°Ð¹-Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°ÐµÐ¼Ð¸Ñ? Ð¾Ð¿Ð¸Ñ?.">
-<!ENTITY torbutton.prefs.sec_low_desc "Ð?Ð° Ñ?Ð¾Ð²Ð° Ð½Ð¸Ð²Ð¾ Ð½Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?, Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð½Ð° Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð° Ñ?Ð° Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ð°Ð½Ð¸.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ñ?Ð¼ Ð·Ð° Ñ?ÐµÐ½Ð´Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?Ð¸Ñ?Ñ?Ð° Ðµ Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ð?Ð° Ñ?Ð¾Ð²Ð° Ð½Ð¸Ð²Ð¾ Ð½Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?, Ñ?Ð»ÐµÐ´Ð½Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð°Ñ?  (Ð?Ð°Ð´Ñ?Ñ?Ð¶Ð°Ð½Ðµ Ð½Ð° ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð° Ð·Ð° Ð¿Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð¾Ñ?Ñ?Ð¸):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 Ð²Ð¸Ð´ÐµÐ¾ Ð¸ Ð°Ñ?Ð´Ð¸Ð¾ Ð¼ÐµÐ´Ð¸Ñ? Ñ?Ñ?Ð°Ð²Ð°Ñ? &quot;ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð´Ð° Ð¸Ð³Ñ?Ð°ÐµÑ?Ðµ&quot; Ñ?Ñ?ÐµÐ· NoScript">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Ð?Ð° Ð½Ñ?ÐºÐ¾Ð¸ Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ðµ, Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð¶Ð¸ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Ð±Ñ?Ñ?Ð¾Ð½Ð° NoScript Ð»ÐµÐ½Ñ?Ð°Ñ?Ð° Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð¸, Ð·Ð° Ð´Ð° Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?Ñ? Ñ?ÐµÐ·Ð¸ Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð¸ Ð¾Ð±ÐµÐºÑ?Ð¸.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Ð?Ñ?ÐºÐ¾Ð¸ JavaScript Ð¾Ð¿Ñ?Ð¸Ð¼Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ð·Ð° Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?ÐµÐ»Ð½Ð¾Ñ?Ñ? Ñ?Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT ÐºÐ¾Ð¼Ð¿Ð¸Ð»Ð°Ñ?Ð¾Ñ?.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Ð¡ÐºÑ?Ð¸Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½Ð° Ð½Ñ?ÐºÐ¾Ð¸ Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ñ? Ð¿Ð¾-Ð±Ð°Ð²Ð½Ð¾.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "Ð?Ñ?ÐºÐ¾Ð¸ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¼Ð°Ñ?ÐµÐ¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ñ?Ñ?Ð°Ð²Ð½ÐµÐ½Ð¸Ñ? Ñ?Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ðµ Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½.">
-<!ENTITY torbutton.prefs.sec_medium "Ð¡Ñ?ÐµÐ´Ð½Ð¾">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Ð?Ð° Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ðµ, Ð² ÐºÐ¾Ð¸Ñ?Ð¾ JavaScript Ðµ Ñ?Ð°Ð·Ñ?ÐµÑ?ÐµÐ½, Ð¾Ð¿Ñ?Ð¸Ð¼Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ð·Ð° Ñ?ÐºÐ¾Ñ?Ñ?Ñ? Ñ?Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Ð?Ñ?ÐºÐ¾Ð¸ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð·Ð° Ñ?ÐµÐ½Ð´Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ðµ Ñ?Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Ð?ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ?Ñ? Graphite, Ð·Ð° Ñ?ÐµÐ½Ð´Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?Ð¸Ñ?Ñ?Ð° Ðµ Ð·Ð°Ð±Ñ?Ð°Ð½ÐµÐ½.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Ð?Ñ?ÐºÐ¾Ð¸ Ð²Ð¸Ð´Ð¾Ð²Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ñ?Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Ð?Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ñ? Ð¼Ð°Ñ?Ð°Ð±Ð¸Ñ?Ñ?ÐµÐ¼Ð° Ð²ÐµÐºÑ?Ð¾Ñ?Ð½Ð° Ð³Ñ?Ð°Ñ?Ð¸ÐºÐ° Ñ?Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript Ðµ Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð° Ð¿Ð¾ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ð½Ðµ-HTTPS Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ðµ.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ñ?Ð°Ð·Ñ?ÐµÑ?ÐµÐ½ Ð½Ð° Ð±Ð°Ð·Ð°Ñ?Ð° Ð½Ð° Ð±Ñ?Ð¾Ð¹-Ð·Ð°-Ñ?Ð°Ð¹Ñ? Ñ?Ñ?ÐµÐ· Ð±Ñ?Ñ?Ð¾Ð½Ð° NoScript Ð»ÐµÐ½Ñ?Ð° Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð¸.">
-<!ENTITY torbutton.prefs.sec_high "Ð?Ð¸Ñ?Ð¾ÐºÐ¾">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript Ðµ Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð° Ð¿Ð¾ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ Ð·Ð° Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ðµ.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Ð?Ñ?ÐºÐ¾Ð¸ Ñ?Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ðµ Ð¸ Ð¸ÐºÐ¾Ð½Ð¸ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ñ? Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ð£ÐµÐ±Ñ?Ð°Ð¹Ñ?-Ð¾Ñ?Ð¸Ð³Ñ?Ñ?ÐµÐ½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ð»Ð¾Ð²Ðµ Ñ?Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½Ð¸">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor Ð²Ñ?Ñ?Ð·ÐºÐ° Ð·Ð° Ñ?Ð¾Ð·Ð¸ Ñ?Ð°Ð¹Ñ?.">
diff --git a/bn/torbutton.dtd b/bn/torbutton.dtd
index e2fa86fa2..7ccad6a82 100644
--- a/bn/torbutton.dtd
+++ b/bn/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "à¦®à¦§à§?à¦¯à¦®">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/bn_BD/torbutton.dtd b/bn_BD/torbutton.dtd
index 200663e80..28573785e 100644
--- a/bn_BD/torbutton.dtd
+++ b/bn_BD/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦ªà¦¿à¦?à¦?à¦¾à¦°à§?à¦° à¦ªà¦¾à¦°à¦«à¦°à¦®à§?à¦¯à¦¾à¦¨à§?à¦¸, à¦?à§?à¦¬à§?à¦°à§?à¦¡ à¦²à§?à¦?à¦?à¦?, à¦²à§?à¦?à§?à¦², à¦?à¦¨à¦¸à§?à¦?à¦² à¦?à¦°à¦¾ à¦ªà§?à¦²à¦¾à¦?à¦?à¦¨à¦?à§?à¦²à¦¿à¦° à¦?à¦¬à¦¸à§?à¦¥à¦¾à¦¨, à¦?à¦¨à¦¸à§?à¦?à¦² à¦?à¦°à¦¾ à¦ªà§?à¦²à¦¾à¦?à¦?à¦¨à¦?à§?à¦²à¦¿à¦° à¦¤à¦¾à¦²à¦¿à¦?à¦¾, à¦?à¦ªà¦¨à¦¾à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¸à§?à¦¥à¦¿à¦¤à¦¿, à¦¸à§?à¦?à§?à¦°à§?à¦¨ à¦?à¦à¦¿à¦?à¦®à¦¨, à¦¸à§?à¦?à§?à¦°à¦¿à¦¨à§?à¦° à¦?à¦?à¦¾à¦°, à¦¸à¦¾à¦?à¦?-à¦?à¦° à¦¸à¦¾à¦¥à§? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦ªà¦¿à¦?à¦?à¦¾à¦°à§?à¦° à¦?à¦®à¦¨ à¦?à¦¿à¦?à§? à¦?à¦¿à¦¨à¦¿à¦¸ à¦²à§?à¦?à¦¿à¦¯à¦¼à§? à¦°à¦¾à¦?à¦¤à§? à¦?à¦? à¦¬à¦?à§?à¦¸à¦?à¦¿ à¦?à§?à¦? à¦?à¦°à§?à¦¨ à¦¯à¦¾ à¦¸à¦¾à¦?à¦?à¦?à¦¿ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¾à¦?à§? à¦?à¦¨à¦¨à§?à¦¯ à¦¹à¦¤à§? à¦ªà¦¾à¦°à§?à¥¤ à¦¨à¦¿à¦°à§?à¦¦à¦¿à¦·à§?à¦? à¦?à§?à¦® à¦¸à§?à¦¤à¦°, à¦¸à¦®à¦°à§?à¦¥à¦¿à¦¤ à¦«à¦¾à¦?à¦²à§?à¦° à¦§à¦°à¦¨, à¦¸à¦¿à¦¸à§?à¦?à§?à¦® à¦°à¦? à¦?à¦¬à¦? WebGL à¦?à§?à¦·à¦®à¦¤à
 ¦¾à¦?à§?à¦²à¦¿à¥¤">
 <!ENTITY torbutton.prefs.sec_caption "à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾à¦° à¦®à¦¾à¦¤à§?à¦°à¦¾">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "à¦¸à¦¿à¦?à¦¿à¦?à¦°à¦¿à¦?à¦¿ à¦¸à§?à¦²à¦¾à¦?à¦¡à¦¾à¦° à¦?à¦ªà¦¨à¦¾à¦?à§? à¦¨à¦¿à¦°à§?à¦¦à¦¿à¦·à§?à¦? à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§?à¦° à¦¬à§?à¦¶à¦¿à¦·à§?à¦?à§?à¦¯à¦?à§?à¦²à¦¿ à¦?à¦?à§?à¦·à¦® à¦?à¦°à¦¤à§? à¦¦à§?à¦¯à¦¼ à¦¯à¦¾ à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à¦?à§? à¦¹à§?à¦¯à¦¾à¦?à¦¿à¦?à¦¯à¦¼à§?à¦° à¦ªà§?à¦°à¦?à§?à¦·à§?à¦?à¦¾à¦?à§?à¦²à¦¿à¦?à§? à¦?à¦°à¦? à¦¦à§?à¦°à§?à¦¬à¦² à¦?à¦°à§? à¦¤à§?à¦²à¦¤à§? à¦ªà¦¾à¦°à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_low "à¦¨à¦¿à¦®à§?à¦¨ (à¦¡à¦¿à¦«à¦²à§?à¦?)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "à¦?à¦?à¦¿ à¦¸à¦¬à¦?à§?à¦¯à¦¼à§? à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦°à¦¯à§?à¦?à§?à¦¯ à¦?à¦à¦¿à¦?à§?à¦?à¦¤à¦¾ à¦ªà§?à¦°à¦¦à¦¾à¦¨ à¦?à¦°à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_low_desc "à¦?à¦? à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦ªà¦°à§?à¦¯à¦¾à¦¯à¦¼à§?, à¦¸à¦®à¦¸à§?à¦¤ à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¬à§?à¦¶à¦¿à¦·à§?à¦?à§?à¦¯ à¦¸à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦?à¦?à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType à¦«à¦¨à§?à¦? à¦°à§?à¦¨à§?à¦¡à¦¾à¦°à¦¿à¦? à¦ªà§?à¦°à¦?à§?à¦°à¦¿à¦¯à¦¼à¦¾ à¦?à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦?à¦?à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_gen_desc "à¦?à¦? à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦ªà¦°à§?à¦¯à¦¾à¦¯à¦¼à§?, à¦¨à¦¿à¦®à§?à¦¨à¦²à¦¿à¦?à¦¿à¦¤ à¦ªà¦°à¦¿à¦¬à¦°à§?à¦¤à¦¨à¦?à§?à¦²à¦¿ à¦ªà§?à¦°à¦¯à¦¼à§?à¦? à¦?à¦°à§? (à¦¬à¦¿à¦¸à§?à¦¤à¦¾à¦°à¦¿à¦¤ à¦?à¦¨à§?à¦¯ à¦®à¦¾à¦?à¦¸à¦?à¦à¦¾à¦°):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 à¦à¦¿à¦¡à¦¿à¦? à¦?à¦¬à¦? à¦?à¦¡à¦¿à¦? à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾ à¦¨à§?à¦?à¦¸à§?à¦?à§?à¦° à¦®à¦¾à¦§à§?à¦¯à¦®à§? à¦?à§?à¦²à¦¿à¦? à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "à¦?à¦¿à¦?à§? à¦¸à¦¾à¦?à¦?à¦?à§?à¦²à¦¿à¦¤à§?, à¦?à¦? à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾ à¦¬à¦¸à§?à¦¤à§?à¦° à¦¸à¦?à§?à¦·à¦® à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦?à¦ªà¦¨à¦¾à¦?à§? à¦¨à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦?à§?à¦²à¦¬à¦¾à¦° à¦¬à§?à¦¤à¦¾à¦® à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à¦¤à§? à¦¹à¦¬à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "à¦?à¦¿à¦?à§? à¦?à¦¾à¦à¦¾à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦?à¦°à§?à¦®à¦?à§?à¦·à¦®à¦¤à¦¾ à¦?à¦ªà§?à¦?à¦¿à¦®à¦¾à¦?à¦?à§?à¦¶à¦¨ à¦?à¦?à§?à¦·à¦® à¦¹à¦¯à¦¼">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "à¦?à¦¿à¦?à§? à¦¸à¦¾à¦?à¦?à§? à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦?à¦?à§?à¦²à¦¿ à¦§à§?à¦° à¦?à¦¤à¦¿à¦¤à§? à¦?à¦²à¦¤à§? à¦ªà¦¾à¦°à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_mathml_desc "à¦?à¦£à¦¿à¦¤ à¦¸à¦®à§?à¦?à¦°à¦£ à¦ªà§?à¦°à¦¦à¦°à§?à¦¶à¦¨ à¦?à¦¿à¦?à§? à¦ªà§?à¦°à¦?à§?à¦°à¦¿à¦¯à¦¼à¦¾ à¦?à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦¹à¦¯à¦¼à¥¤">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML à¦?à¦?à§?à¦·à¦® à¦?à¦?à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_medium "à¦®à¦§à§?à¦¯à¦®">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "à¦¯à§?à¦?à¦¾à¦¨à§? à¦?à¦¾à¦à¦¾à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦¸à¦?à§?à¦°à¦¿à¦¯à¦¼ à¦?à¦°à¦¾ à¦?à¦?à§? à¦¸à§?à¦? à¦¸à¦¾à¦?à¦?à§?, à¦?à¦¾à¦°à§?à¦¯ à¦¸à¦®à§?à¦ªà¦¾à¦¦à¦¨ à¦?à¦ªà§?à¦?à¦¿à¦®à¦¾à¦?à¦?à§?à¦¶à¦¨à¦?à§?à¦²à¦¿ à¦?à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦?à¦?à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "à¦?à¦¿à¦?à§? à¦«à¦¨à§?à¦? à¦°à§?à¦¨à§?à¦¡à¦¾à¦°à¦¿à¦? à¦¬à§?à¦¶à¦¿à¦·à§?à¦?à§?à¦¯ à¦?à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦?à¦?à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "à¦?à§?à¦°à¦¾à¦«à¦¾à¦?à¦? à¦«à¦¨à§?à¦? à¦°à§?à¦¨à§?à¦¡à¦¾à¦°à¦¿à¦? à¦ªà§?à¦°à¦?à§?à¦°à¦¿à¦¯à¦¼à¦¾ à¦¨à¦¿à¦·à§?à¦?à§?à¦°à¦¿à¦¯à¦¼ à¦?à¦°à¦¾ à¦¹à¦¯à¦¼à¥¤">
-<!ENTITY torbutton.prefs.sec_svg_desc "à¦?à¦¿à¦?à§? à¦§à¦°à¦¨à§?à¦° à¦?à¦¬à¦¿ à¦?à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦?à¦?à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG à¦?à¦¿à¦¤à§?à¦°à¦?à§?à¦²à¦¿ à¦?à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦?à¦?à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_js_https_desc "à¦¸à¦?à¦² à¦?-HTTPS à¦¸à¦¾à¦?à¦?à¦?à§?à¦²à¦¿à¦¤à§? à¦?à¦¾à¦à¦¾à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦¡à¦¿à¦«à¦²à§?à¦?à¦à¦¾à¦¬à§? à¦¨à¦¿à¦·à§?à¦?à§?à¦°à¦¿à¦¯à¦¼ à¦?à¦°à¦¾ à¦?à¦?à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "à¦?à¦¾à¦à¦¾à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦?à¦?à¦?à¦¿ à¦¨à§?à¦?à¦ªà§?à¦¯à¦¾à¦¡ à¦?à§?à¦²à¦¬à¦¾à¦° à¦¬à§?à¦¤à¦¾à¦® à¦®à¦¾à¦§à§?à¦¯à¦®à§? à¦ªà§?à¦°à¦¤à¦¿ à¦¸à¦¾à¦?à¦?à§?à¦° à¦à¦¿à¦¤à§?à¦¤à¦¿à¦¤à§? à¦¸à¦?à§?à¦°à¦¿à¦¯à¦¼ à¦?à¦°à¦¾ à¦¯à¦¾à¦¬à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_high "à¦?à¦?à§?à¦?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "à¦?à¦¾à¦à¦¾à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦¸à¦¬ à¦¸à¦¾à¦?à¦?à§? à¦¡à¦¿à¦«à¦²à§?à¦? à¦¦à§?à¦¬à¦¾à¦°à¦¾ à¦¨à¦¿à¦·à§?à¦?à§?à¦°à¦¿à¦¯à¦¼ à¦?à¦°à¦¾ à¦¹à¦¯à¦¼à¥¤">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "à¦?à¦¿à¦?à§? à¦«à¦¨à§?à¦? à¦?à¦¬à¦? à¦?à¦?à¦?à¦¨ à¦à§?à¦²à¦à¦¾à¦¬à§? à¦ªà§?à¦°à¦¦à¦°à§?à¦¶à¦¨ à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à§?à¥¤">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "à¦?à¦¯à¦¼à§?à¦¬à¦¸à¦¾à¦?à¦? à¦ªà§?à¦°à¦¦à¦¾à¦¨ à¦«à¦¨à§?à¦? à¦«à¦¾à¦?à¦² à¦?à¦¬à¦°à§?à¦¦à§?à¦§ à¦?à¦°à¦¾ à¦¹à¦¯à¦¼à¥¤">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "à¦?à¦? à¦¸à¦¾à¦?à¦?à§?à¦° à¦?à¦¨à§?à¦¯ à¦?à¦° à¦¸à¦¾à¦°à§?à¦?à¦¿à¦?">
diff --git a/bn_IN/torbutton.dtd b/bn_IN/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/bn_IN/torbutton.dtd
+++ b/bn_IN/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/bo/torbutton.dtd b/bo/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/bo/torbutton.dtd
+++ b/bo/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/br/torbutton.dtd b/br/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/br/torbutton.dtd
+++ b/br/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/brx/torbutton.dtd b/brx/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/brx/torbutton.dtd
+++ b/brx/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/bs/torbutton.dtd b/bs/torbutton.dtd
index 786ccae5f..93a8c7e17 100644
--- a/bs/torbutton.dtd
+++ b/bs/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ca/torbutton.dtd b/ca/torbutton.dtd
index ab91aff8b..ca8a0cef1 100644
--- a/ca/torbutton.dtd
+++ b/ca/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantingueu aquesta casella marcada per a ocultar informaciÃ³ sensible sobre vostÃ© a les pÃ gines web, tal com les capacitats de l'ordinador, la distribuciÃ³ del teclat, la localitzaciÃ³ dels connectors instalÂ·lats, la llista de connectors, el seu estat de xarxa, la orientaciÃ³ de la pantalla, el seu tamany, el zoom especÃfic per a cada lloc, els tipus de fitxer acceptats, els colors de sistema i les capacitats WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Nivell de seguretat">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "El control lliscant de seguretat permet deshabilitar caracterÃstiques del navegador que poden permetre vulnerabilitats en atemptats de furoners.">
-<!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. ">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "El mecanisme de renderitzaciÃ³ de tipus de lletra SVG Opentype estÃ  desactivat">
-<!ENTITY torbutton.prefs.sec_gen_desc "En aquest nivell de seguretat s'apliquen els canvis segÃ¼ents (passeu el cursor per sobre per a mÃ©s detalls):">
-<!ENTITY torbutton.prefs.sec_html5_desc "Els VÃdeos HTML5 i  els documents d'audio esdevenen reproduÃ¯bles amb un click mitjanÃ§ant el NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "En alguns llocs haureu de fer servir el botÃ³ NoScript de la barra d'eines per activar aquests objectes audiovisuals.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Algunes optimitzacions de realitzaciÃ³ del JavaScript estan desactivades. ">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "CompilaciÃ³ en temps d'execuciÃ³ ION, expresions regulars natives.">
-<!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_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_medium "MitjÃ ">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "En els llocs on estÃ  activat Javascript, les optimitzacions de rendiment estan desactivades.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Algunes caracterÃstiques de renderitzaciÃ³ de tipus de lletra estan desactivades.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "El mecanisme de renderitzaciÃ³ de tipus de lletre Graphite estÃ  desactivat. ">
-<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipus d'imatge estan desactivats. ">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les imatges SVG estan desactivades. ">
-<!ENTITY torbutton.prefs.sec_js_https_desc "El JavaScript estÃ  desactivat per defecte en tots els llocs no-HTTPS">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "El JavaScript pot ser activat lloc per lloc mitjanÃ§ant el botÃ³ NoScript de la barra d'eines. ">
-<!ENTITY torbutton.prefs.sec_high "Alt">
-<!ENTITY torbutton.prefs.sec_all_js_desc "El JavaScript estÃ  desactivat per defecte a tots els llocs.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipus de lletra i icones poden mostrar-se incorrectament. ">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Els fitxers de tipus de lletra provinents de llocs web estan bloquejats. ">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuit de tor per a aquest lloc">
diff --git a/ceb/torbutton.dtd b/ceb/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ceb/torbutton.dtd
+++ b/ceb/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/cs/torbutton.dtd b/cs/torbutton.dtd
index 9d9bb1287..ccc78dc50 100644
--- a/cs/torbutton.dtd
+++ b/cs/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ponechte toto pole zaÅ¡krtnutÃ©, abyste pÅ?ed webovÃ½mi strÃ¡nkami skryli unikÃ¡tnÃ informace, kterÃ© vÃ¡s mohou identifikovat, napÅ?Ãklad vÃ½kon vaÅ¡eho poÄ?ÃtaÄ?e, rozloÅ¾enÃ klÃ¡vesnice, jazyk, umÃstÄ?nÃ nainstalovanÃ½ch doplÅ?kÅ¯, seznam nainstalovanÃ½ch doplÅ?kÅ¯, stav vaÅ¡Ã sÃtÄ?, otoÄ?enÃ obrazovky, velikost obrazovky, ÃºrovnÄ? pÅ?iblÃÅ¾enÃ pro jednotlivÃ© strÃ¡nky, podporovanÃ© typy souborÅ¯, systÃ©movÃ© barvy a podporovanÃ© funkce WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Ã?roveÅ? zabezpeÄ?enÃ">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "BezpeÄ?nostnÃ posuvnÃk vÃ¡m umoÅ¾nÃ vypnout nÄ?kterÃ© funkce prohlÃÅ¾eÄ?e, kterÃ© mohou vÃ¡Å¡ prohlÃÅ¾eÄ? uÄ?init vÃce nÃ¡chylnÃ½ k hackerskÃ½m ÃºtokÅ¯m.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType mechanismus renderovÃ¡nÃ fontÅ¯ je vypnut.">
-<!ENTITY torbutton.prefs.sec_gen_desc "ZmÄ?ny na tÃ©to bezpeÄ?nostnÃ Ãºrovni (pÅ?ejeÄ?te myÅ¡Ã pro detaily):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video a zvuk mÅ¯Å¾ete pÅ?i NoScript pÅ?ehrÃ¡t kliknutÃm.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Na nÄ?kterÃ½ch strÃ¡nkÃ¡ch je nutnÃ© pouÅ¾Ãt NoScript tlaÄ?Ãtko, abyste zapnuli tyto objekty mÃ©diÃ.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "NÄ?kterÃ© optimalizace JavaScriptu jsou vypnuty.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "StÅ?ednÃ">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Na strÃ¡nkÃ¡ch, kde je povolen JavaScript, jsou optimalizace vÃ½konu zakÃ¡zÃ¡ny.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "VÅ¡echny moÅ¾nosti renderovÃ¡nÃ fontÅ¯ jsou vypnuty.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "RenderovÃ¡nÃ fontÅ¯ Graphite je vypnuto.">
-<!ENTITY torbutton.prefs.sec_svg_desc "NÄ?kterÃ© druhy obrÃ¡zkÅ¯ jsou vypnuty.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "ObrÃ¡zky s pÅ?Ãponou SVG jsou vypnuty.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript je vypnut na vÅ¡ech strÃ¡nkÃ¡ch kromÄ? HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "PouÅ¾itÃm tlaÄ?Ãtka NoScript mÅ¯Å¾ete zapnout JavaScript jen na nÄ?kterÃ½ch strÃ¡nkÃ¡ch.">
-<!ENTITY torbutton.prefs.sec_high "VysokÃ¡">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je defaultnÄ? vypnut na vÅ¡ech strÃ¡nkÃ¡ch.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "NÄ?kterÃ© fonty a ikony se mohou zobrazit Å¡patnÄ?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Soubory fontÅ¯ poskytovanÃ© weby jsou blokovÃ¡ny.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "PÅ?ipojenÃ Tor pro tuto strÃ¡nku">
diff --git a/csb/torbutton.dtd b/csb/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/csb/torbutton.dtd
+++ b/csb/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/cv/torbutton.dtd b/cv/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/cv/torbutton.dtd
+++ b/cv/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/cy/torbutton.dtd b/cy/torbutton.dtd
index 2060f59b1..22dc36bbb 100644
--- a/cy/torbutton.dtd
+++ b/cy/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/da/torbutton.dtd b/da/torbutton.dtd
index 376c7d69e..962f58e26 100644
--- a/da/torbutton.dtd
+++ b/da/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lad denne boks vÃ¦re valgt til for at skjule ting fra websteder som er unikke for dig, inklusiv din computerydelse, tastaturlayout, sprog, placeringen af installerede plugins, listen af installerede plugins, din netvÃ¦rksstatus, skÃ¦rmorientering, skÃ¦rmstÃ¸rrelse, stedspecifikke zoom-niveauer, understÃ¸ttede filtyper, systemfarver og WebGL-formÃ¥enheder.">
 <!ENTITY torbutton.prefs.sec_caption "Sikkerheds Niveau">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Sikkerhedsskyderen giver dig mulighed for at deaktivere bestemte browserfunktionaliteter som kan gÃ¸re din browser sÃ¥rbar overfor forsÃ¸g pÃ¥ hacking.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Renderings mekanismen for SVG OpenType font er slÃ¥et fra">
-<!ENTITY torbutton.prefs.sec_gen_desc "PÃ¥ dette sikkerhedsniveau gÃ¦lder fÃ¸lgende Ã¦ndringer (hold musen over for at se detaljer):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video- og lydfiler gÃ¸res klik-for-at-afspille via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "PÃ¥ nogle sider, skal du mÃ¥ske bruge vÃ¦rktÃ¸jslinjeknappen NoScript for at aktivere disse mediaobjekter.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Nogle JavaScript ydelsesoptimeringer er deaktiveret.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, indbygget regulÃ¦rt udtryk.">
-<!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_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_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "PÃ¥ steder hvor JavaScript er aktiveret, er ydelsesoptimeringer deaktiveret.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Nogle skrifttype udglatnings funktioner er deaktiverede.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite skrifttypens udglatnings funktion er deaktiveret.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Visning af nogle typer af billeder er deaktiveret.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Visning af SVG billeder er deaktiveret.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript er som standard deaktiveret pÃ¥ alle ikke-HTTPS sider.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveres pÃ¥ webstedsbasis via NoScript-knappen pÃ¥ vÃ¦rktÃ¸jlinjen.">
-<!ENTITY torbutton.prefs.sec_high "HÃ¸j">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript er som standard deaktiveret pÃ¥ alle steder.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Nogle fonte og ikoner vil mÃ¥ske vises forkert.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fontfiler som kommer fra websteder, er blokeret.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor-kredslÃ¸b for dette websted">
diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index 6dac97e60..cf5cdc24f 100644
--- a/de/torbutton.dtd
+++ b/de/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lassen Sie dieses Feld ausgewÃ¤hlt um bestimmte einzigartige Informationen Ihres Systems vor Webportalen zu verbergen, wie die Rechnerleistung, Tastaturbelegung, das Sprachprofil, den Installationsort von Erweiterungen, die Liste der installierten Erweiterungen, Ihren Netzwerkstatus, die Bildschirmausrichtung, BildschirmgrÃ¶Ã?e, seitenspezifische VergrÃ¶Ã?erungseinstellungen, unterstÃ¼tzte Dateitypen, Farbschemata und WebGL-FÃ¤higkeiten.">
 <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler kÃ¶nnen Sie bestimmte Browserfunktionen, die Ihren Browser fÃ¼r mÃ¶gliche Attacken anfÃ¤lliger machen, deaktivieren.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Der SVG-OpenType-Schriftdarstellungsvorgang ist deaktiviert.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Auf dieser Sicherheitsstufe gelten die folgenden Ã?nderungen (fÃ¼r weitere Details mit der Maus Ã¼berfahren):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5-Video- und Audiomedien werden per Click-to-Play Ã¼ber NoScript abspielbar.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Auf manchen Webseiten mÃ¼ssen Sie mÃ¶glicherweise die NoScript-SchaltflÃ¤che in der Werkzeugleiste verwenden, um diese Medienobjekte zu aktivieren.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Einige JavaScript-AusfÃ¼hrungsoptimierungen sind deaktiviert.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT-Grundversion.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts kÃ¶nnen auf manchen Seiten langsamer laufen.">
-<!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_medium "Mittel">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Auf Seiten, auf denen JavaScript aktiviert ist, sind Leistungsoptimierungen deaktiviert.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Einige Schriftdarstellungseigenschaften sind deaktiviert.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Der Graphite-Schriftdarstellungsvorgang ist deaktiviert.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Einige Arten von Bilddateien sind deaktiviert.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-Bilder sind deaktiviert.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript ist standardmÃ¤Ã?ig auf allen Nicht-HTTPS-Webseiten deaktiviert.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kann Ã¼ber die NoScript-SchaltflÃ¤che in der Werkzeugleiste fÃ¼r jede Webseite einzeln aktiviert werden.">
-<!ENTITY torbutton.prefs.sec_high "Hoch">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript ist standardmÃ¤Ã?ig auf allen Webseiten deaktiviert.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Manche Schriftarten und Symbole kÃ¶nnten falsch angezeigt werden.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Von Webseiten bereitgestellte Schriftartdateien werden blockiert.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor-Kanal fÃ¼r diese Seite">
diff --git a/dz/torbutton.dtd b/dz/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/dz/torbutton.dtd
+++ b/dz/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/el/torbutton.dtd b/el/torbutton.dtd
index 1b2ae1440..ab9312eae 100644
--- a/el/torbutton.dtd
+++ b/el/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Î?Î¹Î±Ï?Î·Ï?Î®Ï?Ï?Îµ Î±Ï?Ï?Ï? Ï?Î¿ ÎºÎ¿Ï?Ï?Î¯ ÎµÏ?Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿ Î³Î¹Î± Î½Î± ÎºÏ?Ï?Ï?ÎµÏ?Îµ Î±Ï?Ï? Ï?Î¿Ï?Ï? Î¹Ï?Ï?Î¿Ï?Ï?Ï?Î¿Ï?Ï? Ï?Ï?Î¬Î³Î¼Î±Ï?Î± Ï?Î¿Ï? Î¸Î± Î¼Ï?Î¿Ï?Î¿Ï?Ï?Î±Î½ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼Î¿Î½Î±Î´Î¹ÎºÎ¬ Î³Î¹Î± ÎµÏ?Î¬Ï?, Ï?Ï?Î¼Ï?ÎµÏ?Î¹Î»Î±Î¼Î²Î±Î½Î¿Î¼ÎÎ½Ï?Î½ Ï?Î·Ï? Î±Ï?Ï?Î´Î¿Ï?Î·Ï? Ï?Î¿Ï? Ï?Ï?Î¿Î»Î¿Î³Î¹Ï?Ï?Î®, Ï?Î·Ï? Î´Î¹Î¬Ï?Î±Î¾Î·Ï? Ï?Î¿Ï? Ï?Î»Î·ÎºÏ?Ï?Î¿Î»Î¿Î³Î¯Î¿Ï?, Ï?Î·Ï? Î³Î»Ï?Ï?Ï?Î±Ï?, Ï?Î·Ï? Ï?Î¿Ï?Î¿Î¸ÎµÏ?Î¯Î±Ï? Ï?Ï?Î½ ÎµÎ³ÎºÎ±Ï?ÎµÏ?Ï?Î·Î¼ÎÎ½Ï?Î½ Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Î½, Ï?Î·Ï? ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î·Ï? Ï?Î¿Ï? Î´Î¹ÎºÏ?Ï?Î¿Ï?, Ï?Î¿Ï? Ï?Ï?Î¿Ï?Î±Î½Î±Ï?Î¿Î»Î¹Ï?Î¼Î¿Ï? Ï?Î·Ï? Î¿Î¸Ï?Î½Î·Ï?, Ï?Î¿Ï? Î¼ÎµÎ³ÎÎ¸Î¿Ï?Ï? Ï?Î·Ï? Î¿Î¸Ï?Î½Î·Ï?, Ï?Ï?Î½ ÎµÏ?Î¹Ï?ÎÎ´Ï?Î½ zoom Î±Î½Î¬ site, Ï?Ï?Î½ Ï?Ï?Î¿Ï?Ï?Î·Ï?Î¹Î¶Ï?Î¼ÎµÎ½Ï?Î½ Ï?Ï?Ï?Ï?Î½ Î±Ï?Ï?ÎµÎ¯Ï?Î½, Ï?Ï?Î½ Ï?Ï?Ï?Î¼Î¬Ï?Ï?Î½ Ï?Î¿Ï? Ï?Ï?Ï?Ï?Î®Î¼Î±Ï?Î¿Ï? ÎºÎ±Î¹ Ï?Ï?Î½ Î´Ï?Î½Î±Ï?Î¿Ï?Î®Ï?Ï?Î½ WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Î?Ï?Î¯Ï?ÎµÎ´Î¿ Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Î¤Î¿ Slider Î?Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï? Ï?Î±Ï? Î±Ï?Î®Î½ÎµÎ¹ Î½Î± Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Î¿Ï?Î¹Ï?Î¼ÎÎ½Î± Ï?Î±Ï?Î±ÎºÏ?Î·Ï?Î¹Ï?Ï?Î¹ÎºÎ¬ Ï?Î¿Ï? Ï?Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î® Ï?Î¿Ï? Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Ï?Î¿Î½ ÎºÎ¬Î½Î¿Ï?Î½ Ï?Î¹Î¿ ÎµÏ?Î¬Î»Ï?Ï?Î¿ Ï?Îµ Ï?Ï?Î¿Ï?Ï?Î¬Î¸ÎµÎ¹ÎµÏ? hacking.">
-<!ENTITY torbutton.prefs.sec_low "Î§Î±Î¼Î·Î»Ï? (Ï?Ï?Î¿ÎµÏ?Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "Î?Ï?Ï?Ï? Ï?Î±Ï?ÎÏ?ÎµÎ¹ Ï?Î·Î½ Ï?Î¹Î¿ ÎµÏ?Ï?Ï?Î·Ï?Ï?Î· ÎµÎ¼Ï?ÎµÎ¹Ï?Î¯Î±.">
-<!ENTITY torbutton.prefs.sec_low_desc "Î£Îµ Î±Ï?Ï?Ï? Ï?Î¿ ÎµÏ?Î¯Ï?ÎµÎ´Î¿ Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?, Ï?Î»ÎµÏ? Î¿Î¹ Î´Ï?Î½Î±Ï?Ï?Ï?Î·Ï?ÎµÏ? Ï?Î¿Ï? browser ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½ÎµÏ?.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Î? Î¼Î·Ï?Î±Î½Î¹Ï?Î¼Ï?Ï? rendering Î³Ï?Î±Î¼Î¼Î±Ï?Î¿Ï?ÎµÎ¹Ï?Î¬Ï? SVG OpenType ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿Ï?.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Î£Îµ Î±Ï?Ï?Ï? Ï?Î¿ ÎµÏ?Î¯Ï?ÎµÎ´Î¿ Î±Ï?Ï?Î±Î»ÎµÎ¯ÎµÏ?, Î³Î¯Î½Î¿Î½Ï?Î±Î¹ Î¿Î¹ Î±ÎºÏ?Î»Î¿Ï?Î¸ÎµÏ? Î±Î»Î»Î±Î³ÎÏ? (Ï?Î¿Ï?Î¿Î¸ÎµÏ?Î®Ï?Ï?Îµ Ï?Î¿ Ï?Î¿Î½Ï?Î¯ÎºÎ¹ Î±Ï?Ï? Ï?Î¬Î½Ï? Î³Î¹Î± Î»ÎµÏ?Ï?Î¿Î¼ÎÏ?ÎµÎ¹ÎµÏ?):">
-<!ENTITY torbutton.prefs.sec_html5_desc "Î¤Î± HTML5 video ÎºÎ±Î¹ audio media ÎÎ³Î¹Î½Î±Î½ click-to-play Î¼ÎÏ?Ï? NoScript. ">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Î£Îµ ÎºÎ¬Ï?Î¿Î¹ÎµÏ? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ?, Î¯Ï?Ï?Ï? Î¸Î± Ï?Ï?ÎµÎ¹Î±Ï?Ï?ÎµÎ¯ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Ï?Î¿ NoScript ÎºÎ¿Ï?Î¼Ï?Î¯ Î³Ï?Î±Î¼Î¼Î®Ï? ÎµÏ?Î³Î±Î»ÎµÎ¹Ï?Î½ Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Î±Ï?Ï?Î¬ Ï?Î± media Î±Î½Ï?Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î±. ">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Î?Î¬Ï?Î¿Î¹ÎµÏ? Î²ÎµÎ»Ï?Î¹Ï?Ï?Î¿Ï?Î¿Î¹Î®Ï?ÎµÎ¹Ï? ÎµÏ?Î¯Î´Î¿Ï?Î·Ï? JavaSctipt ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½ÎµÏ?. ">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Î¤Î± scripts Ï?Îµ ÎºÎ¬Ï?Î¿Î¹ÎµÏ? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ? ÎµÎ½Î´ÎÏ?ÎµÏ?Î±Î¹ Î½Î± Ï?Ï?ÎÏ?Î¿Ï?Î½ Ï?Î¹Î¿ Î±Ï?Î³Î¬. ">
-<!ENTITY torbutton.prefs.sec_mathml_desc "Î?Î¬Ï?Î¿Î¹Î¿Î¹ Î¼Î·Ï?Î±Î½Î¹Ï?Î¼Î¿Î¯ Î³Î¹Î± ÎµÎ¼Ï?Î¬Î½Î¹Ï?Î· Î¼Î±Î¸Î·Î¼Î±Ï?Î¹ÎºÏ?Î½ ÎµÎ¾Î¹Ï?Ï?Ï?ÎµÏ?Î½ ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿Î¹.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ÎµÎ¹Î½Î±Î¹ ÎµÏ?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿.">
-<!ENTITY torbutton.prefs.sec_medium "Î?ÎµÏ?Î±Î¯Î¿">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Î£Îµ Î¹Ï?Ï?Ï?Ï?Î¿Ï?Î¿Ï?Ï? Ï?Î¿Ï? Î· JavaScript ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î·, Î¿Î¹ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î±Ï?Ï?Î´Î¿Ï?Î·Ï? ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½ÎµÏ?.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Î?Î¬Ï?Î¿Î¹ÎµÏ? Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¯ÎµÏ? rendering Î³Ï?Î±Î¼Î¼Î±Ï?Î¿Ï?ÎµÎ¹Ï?Î¬Ï? ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½ÎµÏ?.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Î? Î¼Î·Ï?Î±Î½Î¹Ï?Î¼Ï?Ï? rendering Ï?Î·Ï? Î³Ï?Î±Î¼Î¼Î±Ï?Î¿Ï?ÎµÎ¹Ï?Î¬Ï? Graphite ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿Ï?.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Î?Î¬Ï?Î¿Î¹Î¿Î¹ Ï?Ï?Ï?Î¿Î¹ ÎµÎ¹ÎºÏ?Î½Ï?Î½ ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿Î¹.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Î?Î¹ ÎµÎ¹ÎºÏ?Î½ÎµÏ? Ï?Ï?Ï?Î¿Ï? SVG ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½ÎµÏ?. ">
-<!ENTITY torbutton.prefs.sec_js_https_desc "Î? JavaScript ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î· Î±Ï?Ï? Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Î® Ï?Îµ Ï?Î»ÎµÏ? Ï?Î¹Ï? Î¼Î·-HTTPS Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ?. ">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Î? JavaScript Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¸ÎµÎ¯ Î±Î½Î¬ Î´Î¹ÎºÏ?Ï?Î±ÎºÏ? Ï?Ï?Ï?Î¿ Î¼Îµ Ï?Î¿ ÎºÎ¿Ï?Î¼Ï?Î¯ NoScript Ï?Ï?Î· Î³Ï?Î±Î¼Î¼Î® ÎµÏ?Î³Î±Î»ÎµÎ¹Ï?Î½.">
-<!ENTITY torbutton.prefs.sec_high "Î¥Ï?Î·Î»Ï?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "Î? JavaScript ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î· Î±Ï?Ï? Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Î® Ï?Îµ Ï?Î»ÎµÏ? Ï?Î¹Ï? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Î?Î¬Ï?Î¿Î¹ÎµÏ? Î³Ï?Î±Î¼Î¼Î±Ï?Î¿Ï?ÎµÎ¹Ï?ÎÏ? ÎºÎ±Î¹ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î± Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± ÎµÎ¼Ï?Î±Î½Î¯Î¶Î¿Î½Ï?Î±Î¹ Î»Î±Î½Î¸Î±Ï?Î¼ÎÎ½Î±.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Î¤Î± Î±Ï?Ï?ÎµÎ¯Î± Î³Ï?Î±Î¼Î¼Î±Ï?Î¿Ï?ÎµÎ¹Ï?Ï?Î½ Ï?Î¿Ï? Ï?Î±Ï?ÎÏ?Î¿Î½Ï?Î±Î¹ Î±Ï?Ï? Ï?Î·Î½ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î± ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î±.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Î?Ï?ÎºÎ»Ï?Î¼Î± Tor Î³Î¹Î± Î±Ï?Ï?Î®Î½ Ï?Î·Î½ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î±">
diff --git a/en/torbutton.dtd b/en/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/en/torbutton.dtd
+++ b/en/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/en_GB/torbutton.dtd b/en_GB/torbutton.dtd
index 3281d6f3e..7ccad6a82 100644
--- a/en_GB/torbutton.dtd
+++ b/en_GB/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimisations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/eo/torbutton.dtd b/eo/torbutton.dtd
index fb445e4c6..b684841a6 100644
--- a/eo/torbutton.dtd
+++ b/eo/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Alta">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index a562e009c..1a0f9fda3 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantenga esta casilla marcada para ocultar cosas a los sitios web que podrÃan ser Ãºnicas acerca de usted, incluyendo el rendimiento de su equipo, plano de teclado, localizaciÃ³n, lista y ubicacion de complementos instalados, estado de su red, orientaciÃ³n de pantalla, tamaÃ±o de pantalla, niveles de zoom especÃfico del sitio, tipos de fichero soportados, colores del sistema, y capacidades WebGL. ">
 <!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "El control deslizante del nivel de seguridad le permite deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo mÃ¡s vulnerable a tentativas de hackeo.">
-<!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 estÃ¡n habilitadas todas las funcionalidades del navegador .">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "El mecanismo de representaciÃ³n de fuentes SVG OpenType estÃ¡ deshabilitado.">
-<!ENTITY torbutton.prefs.sec_gen_desc "En este nivel de seguridad se aplican los siguientes cambios (ratÃ³n encima para detalles):">
-<!ENTITY torbutton.prefs.sec_html5_desc "Los medios de vÃdeo y audio HTML5 se vuelven tipo clic-para-reproducir mediante NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios puede que necesite usar el botÃ³n NoScript de la barra de herramientas para habilitar estos objetos audiovisuales.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Algunas optimizaciones de rendimiento de JavaScript estÃ¡n deshabilitadas.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantÃ¡neo optimizado), RegExp nativas.">
-<!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_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_medium "Medio">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "En sitios donde JavaScript estÃ© habilitado, las optimizaciones de rendimiento estÃ¡n deshabilitadas.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Algunas caracterÃsticas de representaciÃ³n de fuentes estÃ¡n deshabilitadas.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "El mecanismo de representaciÃ³n de fuentes Graphite estÃ¡ deshabilitado.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Algunos tipos de imÃ¡genes estÃ¡n deshabilitados.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Las imÃ¡genes SVG estÃ¡n deshabilitadas.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript estÃ¡ deshabilitado por defecto en todos los sitios que no usan HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript puede habilitarse por sitios mediante el botÃ³n de barra de herramientas de NoScript.">
-<!ENTITY torbutton.prefs.sec_high "Alto">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript estÃ¡ deshabilitado por defecto en todos los sitios.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Algunas fuentes e iconos pueden mostrarse de forma incorrecta.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Los ficheros de fuentes proporcionados por el sitio web estÃ¡n bloqueados.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio">
diff --git a/es_AR/torbutton.dtd b/es_AR/torbutton.dtd
index 476d4b342..cb535d4ae 100644
--- a/es_AR/torbutton.dtd
+++ b/es_AR/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "El mecanismo de dibujado para las fuentes SVG OpenType esta desactivado.">
-<!ENTITY torbutton.prefs.sec_gen_desc "En este nivel de seguridad, aplican los siguientes cambios ( pase el ratÃ³n para mas detalles):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, vas a necesitar usar el boton de NoScript para habilitar esos objetos multimedia.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Algunas optimizaciones de performance de JavaScript estan deshabilitadas.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Medio">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "En los sitios en los que JavaScript estÃ¡ habilitado, las optimizaciones de performance estÃ¡n deshabilitadas">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Algunos metodos de dibujo de fuentes estan desactivados.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "El mecanismo de dibujado de fuentes Graphite estÃ¡ deshabilitado.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Algunos tipos de imÃ¡genes estÃ¡n deshabilitados.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imagenes SVG estÃ¡n deshabilitadas.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript estÃ¡ deshabilitado por defecto en todos los sitios no-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Alto">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript estÃ¡ deshabilitado por defecto en todos los sitios.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio">
diff --git a/es_CL/torbutton.dtd b/es_CL/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/es_CL/torbutton.dtd
+++ b/es_CL/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/es_CO/torbutton.dtd b/es_CO/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/es_CO/torbutton.dtd
+++ b/es_CO/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/es_MX/torbutton.dtd b/es_MX/torbutton.dtd
index 124bb7009..89b9569dd 100644
--- a/es_MX/torbutton.dtd
+++ b/es_MX/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/et/torbutton.dtd b/et/torbutton.dtd
index cf56c82fb..d375320aa 100644
--- a/et/torbutton.dtd
+++ b/et/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/eu/torbutton.dtd b/eu/torbutton.dtd
index cfffc7933..823cf58d9 100644
--- a/eu/torbutton.dtd
+++ b/eu/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ezgaituta dago.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG irudiak ezgaituta daude.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Altua">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webguneak hornitutako letra fitxategiak blokeatuta daude.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Gune honetako Tor zirkuitua">
diff --git a/fa/torbutton.dtd b/fa/torbutton.dtd
index bd3eb16b6..5f0a627c5 100644
--- a/fa/torbutton.dtd
+++ b/fa/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "Ø¯Ø± Ø§Û?Ù? Ø³Ø·Ø Ø§Ù?Ù?Û?ØªÛ?Ø? ØªÙ?Ø§Ù? Ù?Û?Ú?Ú¯Û? Ù?Ø§Û? Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø§ Ù?Ø¹Ø§Ù? Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Ù?Ú©Ø§Ù?Û?Ø³Ù? Ø±Ù?Ø¯Ø± Ù?Ù?Ù?Øª SVG Ø§Ù¾Ù? ØªØ§Û?Ù¾ ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ø¯Ø± Ø§Û?Ù? Ø³Ø·Ø Ø§Ù?Ù?Û?ØªÛ?Ø? ØªØºÛ?Û?Ø±Ø§Øª Ø²Û?Ø± Ø§Ø¹Ù?Ø§Ù? Ù?Û? Ø´Ù?Ø¯ (Ø®Ù?Ø§ØµÙ? Ø´Ø¯Ù? Ø¨Ø±Ø§Û? Ø¬Ø²Ø¦Û?Ø§Øª Ø¨Û?Ø´ØªØ±):">
-<!ENTITY torbutton.prefs.sec_html5_desc "ØµØ¯Ø§ Ù? ØªØµÙ?Û?Ø± HTML5 Ø§Ø² Ø·Ø±Û?Ù? Ø¯Ú©Ù?Ù? NoScript Ù?Ù?Ø§Ø± Ø§Ø¨Ø²Ø§Ø± Ø¨Ù? ØØ§Ù?Øª -Ú©Ù?Û?Ú© Ø¨Ø±Ø§Û? Ù¾Ø®Ø´- Ø¯Ø± Ù?Û? Ø¢Û?Ø¯">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Ø¯Ø± Ø¨Ø±Ø®Û? Ø³Ø§Û?Øª Ù?Ø§Ø? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø´Ù?Ø§ Ù?Û?Ø§Ø² Ø¨Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ø¯Ú©Ù?Ù? NoScript Ù?Ù?Ø§Ø± Ø§Ø¨Ø²Ø§Ø± Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ø§Û?Ù? Ø§Ø´Û?Ø§Ø¡ Ø±Ø³Ø§Ù?Ù? Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Ø¨Ø±Ø®Û? Ø§Ø² Ø¨Ù?Û?Ù?Ù? Ø³Ø§Ø²Û? Ø¹Ù?Ù?Ú©Ø±Ø¯ Ø¬Ø§Ù?Ø§ Ø§Ø³Ú©Ø±Û?Ù¾Øª ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ø´Ø¯Ù? Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT Ø¯Ø± Ø´Ø±Ù?Ø¹ Ù?Ø·Ø§Ù?Ø¹Ù?.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Ø§Ø³Ú©Ø±Û?Ù¾Øª Ù?Ù? Ø¯Ø± Ø¨Ø±Ø®Û? Ø§Ø² Ø³Ø§Û?Øª Ù?Ø§ Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¢Ù?Ø³ØªÙ? ØªØ± Ø§Ø¬Ø±Ø§ Ø´Ù?Ø¯.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "Ø¨Ø±Ø®Û? Ù?Ú©Ø§Ù?Û?Ø³Ù? Ù?Ø§ Ù?Ù?Ø§Û?Ø´ Ù?Ø¹Ø§Ø¯Ù?Ø§Øª Ø±Û?Ø§Ø¶Û? ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ù?Û? Ø¨Ø§Ø´Ø¯.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_medium "Ù?ØªÙ?Ø³Ø·">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Ø¨Ù?Û?Ù?Ù? Ø³Ø§Ø²Û? Ø¹Ù?Ù?Ú©Ø±Ø¯ Ø¯Ø± Ø³Ø§Û?Øª Ù?Ø§Û? ØØ§Ù?Û? Ø¬Ø§Ù?Ø§ Ø§Ø³Ú©Ø±Û?Ù¾Øª ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ø´Ø¯Ù? Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Ø¨Ø±Ø®Û? Ø§Ø² Ù?Û?Ú?Ú¯Û? Ù?Ø§Û? Ø±Ù?Ø¯Ø± Ù?Ù?Ù?Øª ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ù?Û? Ø¨Ø§Ø´Ø¯.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Ù?Ú©Ø§Ù?Û?Ø³Ù? Ú¯Ø±Ø§Ù?Û?Øª Ø±Ù?Ø¯Ø± Ù?Ù?Ù?Øª ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Ø¨Ø±Ø®Û? Ø§Ø² Ø§Ù?Ù?Ø§Ø¹ ØªØµØ§Ù?Û?Ø± ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ù?Ø³ØªÙ?Ø¯.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "ØªØµØ§Ù?Û?Ø± SVG ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ù?Û? Ø¨Ø§Ø´Ø¯.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "Ø¬Ø§Ù?Ø§ Ø§Ø³Ú©Ø±Û?Ù¾Øª Ø¨Ù? Ø·Ù?Ø± Ù¾Û?Ø´ Ù?Ø±Ø¶ Ø¯Ø± ØªÙ?Ø§Ù?Û? Ø³Ø§Û?Øª Ù?Ø§Û? ØºÛ?Ø± HTTPS ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Ø¬Ø§Ù?Ø§ Ø§Ø³Ú©Ø±Û?Ù¾ Ø¨Ø±Ø§Û? Ù?Ø± Ù?Ø¨ Ø³Ø§Û?Øª Ø§Ø² Ø·Ø±Û?Ù? Ø¯Ú©Ù?Ù? NoScript Ù?Ù?Ø§Ø± Ø§Ø¨Ø²Ø§Ø± Ù?Ø¹Ø§Ù? Ù?Û? Ø´Ù?Ø¯.">
-<!ENTITY torbutton.prefs.sec_high "Ø²Û?Ø§Ø¯">
-<!ENTITY torbutton.prefs.sec_all_js_desc "Ø¬Ø§Ù?Ø§ Ø§Ø³Ú©Ø±Û?Ù¾Øª Ø¨Ù? Ø·Ù?Ø± Ù¾Û?Ø´ Ù?Ø±Ø¶ Ø¯Ø± ØªÙ?Ø§Ù?Û? Ø³Ø§Û?Øª Ù?Ø§ ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ø§Ø³Øª.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Ø¨Ø±Ø®Û? Ø§Ø² Ù?Ù?Ù?Øª Ù?Ø§ Ù? Ø¢Û?Ú©Ù?Ù? Ù?Ø§Û? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ù?Ù?Ø§Û?Ø´ Ù?Ø§Ø¯Ø±Ø³Øª Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Ù?Ø¯.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ù?Ø§Û?Ù? Ù?Ø§Û? Ù?Ù?Ù?ØªÛ? Ú©Ù? Ø¯Ø± Ù?Ø¨ Ø³Ø§Û?Øª Ø§Ø±Ø§Ø¦Ù? Ù?Û? Ø´Ù?Ù?Ø¯ Ù?Ø³Ø¯Ù?Ø¯ Ø´Ø¯Ù? Ø§Ø³Øª.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Ù?Ø¯Ø§Ø± ØªÙ?Ø± Ø¨Ø±Ø§Û? Ø§Û?Ù? Ø³Ø§Û?Øª">
diff --git a/fi/torbutton.dtd b/fi/torbutton.dtd
index 025a3bf19..a5a6c794b 100644
--- a/fi/torbutton.dtd
+++ b/fi/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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Ã¤.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType-kirjasinrenderointimekanismi on poissa kÃ¤ytÃ¶stÃ¤.">
-<!ENTITY torbutton.prefs.sec_gen_desc "TÃ¤llÃ¤ turvatasolla toteutetaan seuraavat muutokset (katso yksityiskohdat siirtÃ¤mÃ¤llÃ¤ hiiriosoitin kohdalle):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5-videomedia ja -audiomedia voivat tulla napsauksella soitettavaksi NoScript-painikkeen kautta. ">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Joillakin sivustoilla saatat tarvita NoScript-tyÃ¶kalupalkkipainikkeen kÃ¤yttÃ¶Ã¤ nÃ¤iden media-objektien kÃ¤yttÃ¶Ã¶nottamiseksi.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Jotkut JavaScript-suorituskykyoptimoinnit ovat poissa kÃ¤ytÃ¶stÃ¤.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Jotkut kirjasinrenderointiominaisuudet ovat poissa kÃ¤ytÃ¶stÃ¤.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite-kirjasinrenderointimekanismi on poissa kÃ¤ytÃ¶stÃ¤.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Jotkut kuvien tyypit ovat poissa kÃ¤ytÃ¶stÃ¤.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-kuvat ovat poissa kÃ¤ytÃ¶stÃ¤.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript on oletuksena poissa kÃ¤ytÃ¶stÃ¤ kaikilla ei-HTTPS-sivustoilla.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript voidaan ottaa kÃ¤yttÃ¶Ã¶n sivustokohtaisesti NoScript-tyÃ¶kalupalkkipainikkeen kautta.">
-<!ENTITY torbutton.prefs.sec_high "Korkea">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript on oletuksena poissa kÃ¤ytÃ¶stÃ¤ kaikilla sivustoilla.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Jotkut kirjasimet ja kuvakkeet voivat nÃ¤kyÃ¤ virheellisesti.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webbisivuston tarjoamat kirjasintiedostot on estetty.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor-kiertotie tÃ¤lle sivustolle">
diff --git a/fil/torbutton.dtd b/fil/torbutton.dtd
index 83042d604..a6dcac0c3 100644
--- a/fil/torbutton.dtd
+++ b/fil/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Mataas">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/fo/torbutton.dtd b/fo/torbutton.dtd
index 6a2675dda..0ea85bd9e 100644
--- a/fo/torbutton.dtd
+++ b/fo/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "HÃ¸gt">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd
index 0f76beea5..def0ef71f 100644
--- a/fr/torbutton.dtd
+++ b/fr/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochÃ©e pour cacher aux sites Web certaines choses qui pourraient Ãªtre uniques Ã  votre sujet, incluant les performances de votre ordinateur, lâ??agencement du clavier, les paramÃ¨tres de langue, lâ??emplacement des greffons installÃ©s, la liste des greffons installÃ©s, lâ??Ã©tat de votre rÃ©seau, lâ??orientation de lâ??Ã©cran, la taille de lâ??Ã©cran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs systÃ¨me et les capacitÃ©s WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Niveau de sÃ©curitÃ©">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Le bouton de sÃ©curitÃ© coulissant vous permet de dÃ©sactiver certaines fonctions du navigateur qui le rendent plus vulnÃ©rable aux tentatives de piratage.">
-<!ENTITY torbutton.prefs.sec_low "Bas (par dÃ©faut)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "Cela 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mÃ©canisme de rendu de police SVG OpenType est dÃ©sactivÃ©.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ã? ce niveau de sÃ©curitÃ©, les changements suivants sont applicables (survolez avec la souris pour plus de dÃ©tails) :">
-<!ENTITY torbutton.prefs.sec_html5_desc "Le contenuÂ HTML5 vidÃ©o et audio devient Â«Â cliquer pour lireÂ Â» avec NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Pour certains sites, vous aurez peut-Ãªtre Ã  utiliser le bouton NoScript de la barre dâ??outils pour activer ces objets multimÃ©dias.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Certaines optimisations de performance de JavaScript sont dÃ©sactivÃ©es.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Moyen">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Sur les sites oÃ¹ JavaScript est activÃ©, les optimisations des performances sont dÃ©sactivÃ©es.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctions de rendu de police sont dÃ©sactivÃ©es.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mÃ©canisme de rendu de police Graphite est dÃ©sactivÃ©.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Certains types dâ??images sont dÃ©sactivÃ©s.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les images SVG sont dÃ©sactivÃ©es.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript est dÃ©sactivÃ© par dÃ©faut pour tous les sites non HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut Ãªtre activÃ© par site avec le bouton NoScript de la barre dâ??outils">
-<!ENTITY torbutton.prefs.sec_high "Ã?levÃ©">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est dÃ©sactivÃ© par dÃ©faut pour tous les sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Certains polices et icÃ´nes pourraient ne pas sâ??afficher correctement.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les polices fournies par les sites Web sont bloquÃ©es.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site">
diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd
index ff0359ebc..dc573e0f4 100644
--- a/fr_CA/torbutton.dtd
+++ b/fr_CA/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochÃ©e pour cacher aux sites Web certaines choses qui pourraient Ãªtre uniques Ã  votre sujet, incluant les performances de votre ordinateur, lâ??agencement du clavier, les paramÃ¨tres de langue, lâ??emplacement des plugiciels installÃ©s, la liste des plugiciels installÃ©s, lâ??Ã©tat de votre rÃ©seau, lâ??orientation de lâ??Ã©cran, la taille de lâ??Ã©cran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs systÃ¨me et les capacitÃ©s WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Niveau de sÃ©curitÃ©">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Le bouton de sÃ©curitÃ© coulissant vous permet de dÃ©sactiver certaines fonctions du navigateur qui le rendent plus vulnÃ©rable aux tentatives de piratage.">
-<!ENTITY torbutton.prefs.sec_low "Bas (par dÃ©faut)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "Cela 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mÃ©canisme de rendu de police SVG OpenType est dÃ©sactivÃ©.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ã? ce niveau de sÃ©curitÃ©, les changements suivants sont applicables (survolez avec la souris pour plus de dÃ©tails ) :">
-<!ENTITY torbutton.prefs.sec_html5_desc "Le contenuÂ HTML5 vidÃ©o et audio devient Â«Â cliquer pour lireÂ Â» avec NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Pour certains sites, vous aurez peut-Ãªtre Ã  utiliser le bouton NoScript de la barre dâ??outils pour activer ces objets multimÃ©dias.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Certaines optimisations de performance de JavaScript sont dÃ©sactivÃ©es.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Moyen">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Sur les sites oÃ¹ JavaScript est activÃ©, les optimisations des performances sont dÃ©sactivÃ©es.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctions de rendu de police sont dÃ©sactivÃ©es.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mÃ©canisme de rendu de police Graphite est dÃ©sactivÃ©.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Certains types dâ??images sont dÃ©sactivÃ©s.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les images SVG sont dÃ©sactivÃ©es.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript est dÃ©sactivÃ© par dÃ©faut pour tous les sites non HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut Ãªtre activÃ© par site avec le bouton NoScript de la barre dâ??outils">
-<!ENTITY torbutton.prefs.sec_high "Ã?levÃ©">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est dÃ©sactivÃ© par dÃ©faut pour tous les sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Certains polices et icÃ´nes pourraient ne pas sâ??afficher correctement.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les polices fournies par les sites Web sont bloquÃ©es.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site">
diff --git a/fur/torbutton.dtd b/fur/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/fur/torbutton.dtd
+++ b/fur/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/fy/torbutton.dtd b/fy/torbutton.dtd
index c1eb03827..d80232c54 100644
--- a/fy/torbutton.dtd
+++ b/fy/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Heech">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ga/torbutton.dtd b/ga/torbutton.dtd
index 8fdd21189..41afaf2c2 100644
--- a/ga/torbutton.dtd
+++ b/ga/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Coinnigh tic sa bhosca seo chun sonraÃ a bhaineann leatsa go pearsanta a chur i bhfolach Ã³ shuÃmh GhrÃ©asÃ¡in, mar shampla luas do rÃomhaire, leagan amach do mhÃ©archlÃ¡ir, an logchaighdeÃ¡n, an Ã¡it ina bhfuil forlÃontÃ¡in suiteÃ¡ilte, na forlÃontÃ¡in shuiteÃ¡ilte fÃ©in, stÃ¡das do lÃonra, treoshuÃomh an scÃ¡ileÃ¡in, mÃ©id an scÃ¡ileÃ¡in, leibhÃ©il zÃºmÃ¡la ar shuÃmh ar leith, cineÃ¡lacha comhaid a dtacaÃonn do bhrabhsÃ¡laÃ leo, dathanna an chÃ³rais, agus acmhainnÃ WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "LeibhÃ©al SlÃ¡ndÃ¡la">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Ligeann an SleamhnÃ¡n SlÃ¡ndÃ¡la duit gnÃ©ithe Ã¡irithe sa bhrabhsÃ¡laÃ a dhÃchumasÃº nuair is fÃ©idir le bradaÃ iad a ÃºsÃ¡id chun ionsaÃ a dhÃ©anamh ort.">
-<!ENTITY torbutton.prefs.sec_low "Ã?seal-leibhÃ©al (rÃ©amhshocrÃº)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "Tugann sÃ© seo an t-eispÃ©ireas is inÃºsÃ¡idte.">
-<!ENTITY torbutton.prefs.sec_low_desc "Ag an leibhÃ©al slÃ¡ndÃ¡la seo, tÃ¡ gach gnÃ© sa bhrabhsÃ¡laÃ cumasaithe.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "TÃ¡ an rindreÃ¡laÃ clÃ³fhoirne OpenType SVG dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ag an leibhÃ©al slÃ¡ndÃ¡la seo, cuirtear na hathruithe seo a leanas i bhfeidhm (cuir an luch orthu le mionsonraÃ a fhÃ¡il):">
-<!ENTITY torbutton.prefs.sec_html5_desc "Caithfidh tÃº fÃseÃ¡in agus fuaimeanna HTML5 a chliceÃ¡il chun iad a sheinm trÃ NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Ar shuÃmh Ã¡irithe, caithfidh tÃº an cnaipe NoScript sa bharra uirlisÃ a ÃºsÃ¡id chun na meÃ¡in seo a chumasÃº.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "TÃ¡ roinnt optamÃºchÃ¡n JavaScript dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Slonn IonadaÃochta DÃºchasach">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT bonnlÃne.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "B'fhÃ©idir go mbeadh scripteanna ar shuÃmh Ã¡irithe nÃos moille.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "TÃ¡ roinnt acmhainnÃ a thaispeÃ¡nann cothromÃ³idÃ matamaiticiÃºla dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "TÃ¡ MathML dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_medium "MeÃ¡nleibhÃ©al">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Ar shuÃmh ar a bhfuil JavaScript cumasaithe, tÃ¡ optamÃºchÃ¡in JavaScript dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "TÃ¡ roinnt gnÃ©ithe rindreÃ¡la clÃ³fhoirne dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "TÃ¡ an rindreÃ¡laÃ clÃ³fhoirne Graphite dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_svg_desc "TÃ¡ cineÃ¡lacha Ã¡irithe ÃomhÃ¡ dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "TÃ¡ ÃomhÃ¡nna SVG dÃchumasaithe.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "TÃ¡ JavaScript dÃchumasaithe de rÃ©ir rÃ©amhshocraithe ar shuÃmh nach mbaineann ÃºsÃ¡id as HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Is fÃ©idir leat an cnaipe NoScript sa bharra uirlisÃ a ÃºsÃ¡id chun JavaScript a chumasÃº ar shuÃmh ar leith.">
-<!ENTITY torbutton.prefs.sec_high "ArdleibhÃ©al">
-<!ENTITY torbutton.prefs.sec_all_js_desc "TÃ¡ JavaScript dÃchumasaithe ar gach suÃomh de rÃ©ir rÃ©amhshocraithe.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Seans nach dtaispeÃ¡nfar clÃ³fhoirne agus deilbhÃnÃ Ã¡irithe mar is ceart.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "TÃ¡ cosc ar chlÃ³fhoirne a sholÃ¡thraÃonn suÃmh GhrÃ©asÃ¡in.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Ciorcad Tor don suÃomh seo">
diff --git a/gd/torbutton.dtd b/gd/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/gd/torbutton.dtd
+++ b/gd/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/gl/torbutton.dtd b/gl/torbutton.dtd
index d8042c982..6157c3fa9 100644
--- a/gl/torbutton.dtd
+++ b/gl/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/gu/torbutton.dtd b/gu/torbutton.dtd
index 13ab35df3..f6846a3b6 100644
--- a/gu/torbutton.dtd
+++ b/gu/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/gu_IN/torbutton.dtd b/gu_IN/torbutton.dtd
index 926fc587a..46861c9e8 100644
--- a/gu_IN/torbutton.dtd
+++ b/gu_IN/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/gun/torbutton.dtd b/gun/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/gun/torbutton.dtd
+++ b/gun/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ha/torbutton.dtd b/ha/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ha/torbutton.dtd
+++ b/ha/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/he/torbutton.dtd b/he/torbutton.dtd
index 7deea9b2c..e2caee9ea 100644
--- a/he/torbutton.dtd
+++ b/he/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "×?×©×?×¨ ×ª×?×?×? ×?×? ×?×¡×?×?× ×ª ×?×?×? ×?×?×¡×ª×?×¨ ×?×?×¨×?×? ×?×?×ª×¨×?×? ×©×?×?×?×?×?×? ×?×?×?×?×ª ×?×?×?×?×?×?×? ×?×?×?×?×?, ×?×?×?×? ×?×?×¦×?×¢×? ×?×?×?×©×? ×©×?×?, ×?×¢×¨×? ×?×§×?×?×ª, ×?×?×?×?×¨, ×?×?×§×?×? ×?×?×ª×§×¢×?×? ×?×?×ª×§× ×?×?, ×¨×©×?×?×ª ×?×?×ª×§×¢×?×? ×?×?×?×ª×§× ×?×?, ×?×?×¦×? ×?×¨×©×ª ×©×?×?, ×?×?×?×?× ×?×ª ×?×¡×?, ×?×?×?×? ×?×¡×?, ×¨×?×ª ×ª×¦×?×?×? ×?×?×? ×?×ª×¨, ×¡×?×?×? ×§×?×?×¥ × ×ª×?×?×?×?, ×¦×?×¢×? ×?×¢×¨×?×ª ×?×?×?×?×?×?×ª WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "×¨×?×ª ×?×?×?×?×?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "×?×?×?×?×? ×?×?×?×?×?×? × ×?×ª×? ×?×? ×?×?×©×?×?×ª ×ª×?×?× ×?×ª ×?×¤×?×¤×? ×?×¡×?×?×?×?×ª ×?×©×¨ ×¢×?×?×?×?×ª ×?×¢×©×?×ª ×?×ª ×?×?×¤×?×¤×? ×©×?×? ×?×?×ª×¨ ×¤×?×?×¢ ×?× ×¡×?×?× ×?×ª ×¤×?×¦×?×?.">
-<!ENTITY torbutton.prefs.sec_low "× ×?×?×?×? (×?×¨×?×¨×ª ×?×?×?×?)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "×?×¡×¤×§ ×?×ª ×?×?×?×?×?×? ×?×©×?×?×©×? ×?×?×?×ª×¨.">
-<!ENTITY torbutton.prefs.sec_low_desc "×?×¨×?×ª ×?×?×?×?×? ×?×?, ×?×? ×ª×?×?× ×?×ª ×?×?×¤×?×¤×? ×?×?×?×¤×©×¨×?×ª.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "×?× ×?× ×?×? ×ª×?×¦×?×? ×?×?×?×¤× ×?×? SVG OpenType ×?×?×©×?×ª.">
-<!ENTITY torbutton.prefs.sec_gen_desc "×?×¨×?×ª ×?×?×?×?×? ×?×?, ×?×©×?× ×?×?×?×? ×?×?×?×?×? ×?×?×?×? (×¨×?×£ ×¢×? ×?×¢×?×?×¨ ×?×¤×¨×?×?×?):">
-<!ENTITY torbutton.prefs.sec_html5_desc "×©×?×¢ ×?×?×?×?×?×? ×©×? HTML5 ×?×?×¢×?×¨×? ×?×? &quot;×?×?×¥ ×?× ×?×?×?×?&quot; ×?×?×?×¦×¢×?×ª NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "×?×?×ª×¨×?×? ×?×¡×?×?×?×?×?, ×?×ª×?×? ×©×ª×¦×?×¨×? ×?×?×©×ª×?×© ×?×?×¤×ª×?×¨ ×¡×¨×?×? ×?×?×?×?×? NoScript ×?×?×? ×?×?×¤×©×¨ ×¢×¦×?×? ×?×?×?×? ×?×?×?.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "×?×¡×¤×¨ ×ª×?×?× ×?×ª ×?×?×?×?×? ×?×?×¦×?×¢×?×? ×©×? JavaScript ×?×?×©×?×ª×?×ª.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "×©×?×¨×ª ×?×¡×?×? JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "×ª×¡×¨×?×?×?×? ×?×?×ª×¨×?×? ×?×¡×?×?×?×?×? ×¢×©×?×?×? ×?×¨×?×¥ ×?×?×? ×?×?×ª×¨.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "×?×¡×¤×¨ ×?× ×?× ×?× ×?×? ×©×? ×?×¦×?×ª ×?×©×?×?×?×?×ª ×?×ª×?×?×?×?×ª ×?×?×©×?×ª×?×?.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ×?×?×©×?×ª.">
-<!ENTITY torbutton.prefs.sec_medium "×?×?× ×?× ×?×ª">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "×?×?×ª×¨×?×? ×?×?×? JavaScript ×?×?×?×¤×©×¨, ×?×?×?×?×? ×?×?×¦×?×¢×?×? ×?×?×©×?×ª.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "×?×¡×¤×¨ ×ª×?×?× ×?×ª ×ª×?×¦×?×? ×?×?×¤× ×?×? ×?×?×©×?×ª×?×ª.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "×?× ×?× ×?×? ×ª×?×¦×?×? ×?×?×?×¤× ×?×? Graphite ×?×?×©×?×ª.">
-<!ENTITY torbutton.prefs.sec_svg_desc "×?×¡×¤×¨ ×¡×?×?×? ×ª×?×?× ×?×ª ×?×?×©×?×ª×?×?.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "×ª×?×?× ×?×ª SVG ×?×?×©×?×ª×?×ª.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript ×?×?×©×?×ª ×?×?×¨×?×¨×ª ×?×?×?×? ×?×?×? ×?×?×ª×¨×?×? ×©×?×?× ×? HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript ×?×?×?×? ×?×?×ª×?×¤×©×¨ ×¢×? ×?×¡×?×¡ ×?×?-×?×ª×¨ ×?× ×¤×¨×? ×?×?×?×¦×¢×?×ª ×?×¤×ª×?×¨ ×¡×¨×?×? ×?×?×?×?×? ×©×? NoScript.">
-<!ENTITY torbutton.prefs.sec_high "×?×?×?×?×?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript ×?×?×©×?×ª ×?×?×¨×?×¨×ª ×?×?×?×? ×?×?×? ×?×?×ª×¨×?×?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "×?×¡×¤×¨ ×?×?×¤× ×?×? ×?×¦×?×?×?×?×ª ×¢×?×?×?×?×? ×?×?×?×?×ª ×?×?×¦×?×?×? ×?×¦×?×¨×? ×©×?×?×?×?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "×§×?×¦×? ×?×?×¤×? ×?×¡×?×¤×§×?-×?×ª×¨ ×?×¡×?×?×?×?.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "×?×¢×?×? Tor ×¢×?×?×¨ ×?×ª×¨ ×?×?">
diff --git a/hi/torbutton.dtd b/hi/torbutton.dtd
index 08f834bf1..6f4ddd091 100644
--- a/hi/torbutton.dtd
+++ b/hi/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/hr/torbutton.dtd b/hr/torbutton.dtd
index 362c804c9..112295ebe 100644
--- a/hr/torbutton.dtd
+++ b/hr/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Mehanizam za prikaz SVG OpenType fonta je onemoguÄ?en.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Na ovom sigurnosnom nivou, primjenjuju se sljedeÄ?e promjene (prijeÄ?i miÅ¡em za detalje)">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video i audio mediji postaju klik-za-pokrenuti prek NoScripte.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "MoÅ¾da Ä?ete morati koristiti NoScript alatnu traku na nekim stranicama kako bi omoguÄ?ili ove medijske objekte.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Neke JavaScript optimizacije performansi su iskljuÄ?ene.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Neke znaÄ?ajke prikazivanja fontoca su onemoguÄ?ene.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Mehanizam za prikaz Graphite fonta je onemoguÄ?en.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Neki tipovi slika su onemoguÄ?eni.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG format je onemoguÄ?en.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript je onemoguÄ?en po zadanom na svim ne-HTTPS stranicama.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript moÅ¾e biti omoguÄ?en posebice za svaku stranicu putem gumba na NoScript alatnoj traci.">
-<!ENTITY torbutton.prefs.sec_high "Visoko">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je onemoguÄ?en po zadanom na svim stranicama.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Neki fontovi i ikone mogu biti netoÄ?no prikazani.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fontovi pruÅ¾ani od strane web-stranica su blokirani.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor krug za ovu stranicu">
diff --git a/hr_HR/torbutton.dtd b/hr_HR/torbutton.dtd
index fdef4bb9f..4ce150d2d 100644
--- a/hr_HR/torbutton.dtd
+++ b/hr_HR/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "Sigurnosni klizaÄ? Vam omoguÄ?uje onemoguÄ?avanje odreÄ?enih znaÄ?ajki preglednika koje ga mogu uÄ?initi ranjivijim na hakerske napade.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Mehanizam za prikaz SVG OpenType fontova je onemoguÄ?en.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Na ovoj sigurnosnoj razini, sljedeÄ?e promjene se primjenjuju (preÄ?ite miÅ¡em za detalje):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video i audio mediji postanu klikni-za-reprodukciju putem NoScripta.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Na nekim stranicama Ä?ete morati koristiti NoScript gumb kako bi omoguÄ?ili ove medijske objekte.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Neke optimizacije JavaScripta su onemoguÄ?ene.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Srednje">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Na stranicama gdje je JavaScript omoguÄ?en, optimizacije performansi su onemoguÄ?ene.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Neke znaÄ?ajke prikazivanja fontova su onemoguÄ?ene.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite font mehanizam za prikazivanje je onemoguÄ?en.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Neke vrste slika su onemoguÄ?ene.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG slike su onemoguÄ?ene.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript je onemoguÄ?en pod zadano na svim ne-HTTPS stranicama.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript moÅ¾e biti omoguÄ?en za sve ili pojedinaÄ?ne stranice putem NoScript gumba.">
-<!ENTITY torbutton.prefs.sec_high "Visoka">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je onemoguÄ?en pod zadano na svim stranicama.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Neki fontovi i ikone se moÅ¾da neÄ?e prikazati ispravno.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Datoteke fontova pruÅ¾ene od strane web stranice su blokirane.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor krug za ovu stranicu">
diff --git a/ht/torbutton.dtd b/ht/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ht/torbutton.dtd
+++ b/ht/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/hu/torbutton.dtd b/hu/torbutton.dtd
index 086528cf5..e24034e73 100644
--- a/hu/torbutton.dtd
+++ b/hu/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hagyja ezt a gombot bejelÃ¶lve, hogy elrejtsen dolgokat weboldalak elÅ?l, amik egyedivÃ© tehetik, mint elem Ã¡llapot, szÃ¡mÃtÃ³gÃ©p teljesÃtmÃ©ny, billentyÅ±zet kiosztÃ¡s, hely, a telepÃtett pluginek helye, a telepÃtett pluginek listÃ¡ja, hÃ¡lÃ³zati Ã¡llapota, kÃ©pernyÅ? irÃ¡nyÃtottsÃ¡ga, oldal specifikus nagyÃtÃ¡s szintek, tÃ¡mogatott fÃ¡jltÃpusok, rendszerszÃnek, Ã©s WebGL kÃ©pessÃ©gek,">
 <!ENTITY torbutton.prefs.sec_caption "BiztonsÃ¡gi szint">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "A BiztonsÃ¡gi CsÃºszÃ³ka lehetÅ?vÃ© tesz, hogy kikapcsoljon olyan bÃ¶ngÃ©szÅ? funkcionalitÃ¡sokat, amik sebezhetÅ?vÃ© teszik a tÃ¶rÃ©si kÃsÃ©rletekben.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Az SVG OpenType font renderelÅ? mechanizmusa letiltva.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ezen a biztonsÃ¡gi szinten az alÃ¡bbiak a vÃ¡ltozÃ¡sok  (hÃºzza az egeret fÃ¶lÃ© a rÃ©szletekhez)">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 videÃ³ Ã©s audiÃ³ mÃ©dia kattintÃ¡sra jÃ¡tszhatÃ³ NoScript segÃtsÃ©gÃ©vel.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "NÃ©hÃ¡ny oldalon szÃ¼ksÃ©ge lehet a NoScript toolbar gombra, hogy bekapcsolja ezen mÃ©dia objektumokat.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "NÃ©hÃ¡ny JavaScript teljesÃtmÃ©ny optimalizÃ¡ciÃ³ tiltott.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, NatÃv RegExp.">
-<!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_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_medium "KÃ¶zepes">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Azokon az oldalakon, ahol a JavaScript engedÃ©lyezve van, a teljesÃtmÃ©ny optimalizÃ¡ciÃ³ le van tiltva.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "NÃ©hÃ¡ny font rendelÃ©si funkciÃ³ tiltott.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "A Graphite font renderelÃ©si mechanizmus tiltott.">
-<!ENTITY torbutton.prefs.sec_svg_desc "NÃ©hÃ¡ny kÃ©pformÃ¡tum tiltott.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG kÃ©pek letiltva.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "A JavaScript alapÃ©rtelmezÃ©sben kikapcsolt minden nem HTTPS oldalra.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "A JavaScript oldalankÃ©nt engedÃ©lyezhetÅ? NoScript toolbar gombbal.">
-<!ENTITY torbutton.prefs.sec_high "Magas">
-<!ENTITY torbutton.prefs.sec_all_js_desc "A JavaScript alapÃ©rtelmezetten tiltott minden oldalon.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "NÃ©hÃ¡ny betÅ±kÃ©szlet vagy ikon rosszul jelenhet meg.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Weboldal-biztosÃtott font Ã¡llomÃ¡nyok tiltva.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor Ã¡ramkÃ¶r ehhez az oldalhoz">
diff --git a/hy/torbutton.dtd b/hy/torbutton.dtd
index 63f23bf41..0fd278aa3 100644
--- a/hy/torbutton.dtd
+++ b/hy/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML-Õ¨ Õ¡Õ¶Õ»Õ¡Õ¿Õ¾Õ¡Õ® Õ§:">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ia/torbutton.dtd b/ia/torbutton.dtd
index f92d4ab8f..94917b29e 100644
--- a/ia/torbutton.dtd
+++ b/ia/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/id/torbutton.dtd b/id/torbutton.dtd
index d5fa51dcb..5941b1862 100644
--- a/id/torbutton.dtd
+++ b/id/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Biarkan kotak ini tetap dicentang untuk menyembunyikan hal-hal yang unik tentang Anda dari situs web, termasuk kinerja komputer Anda, susunan keyboard, bahasa, lokasi pengaya terpasang, daftar dari pengaya terpasang, status jaringan, orientasi layar, ukuran layar, tingkat pembesaran situs-spesifik, tipe berkas yang didukung, warna sistem, dan kemampuan WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Tingkat Keamanan">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Penggeser keamanan memungkinkan anda untuk menonaktifkan fitur browser yang dapat membuat browser anda menjadi lebih rentant dari upaya peretasan.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Font OpenType SVG dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Pada tingkat keamanan ini, perubahan berikut berlaku (seret kursor untuk rincian):">
-<!ENTITY torbutton.prefs.sec_html5_desc "Video HTML5 dan audio menjadi Klik-untuk-Menjalankan melalui NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Pada beberapa situs, Anda mungkin perlu memakai tombol NoScript untuk mengaktifkan obyek media ini.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Beberapa performa JavaScript dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Beberapa pengatur penampilan persamaan matematika dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_medium "Sedang">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Pada situs dimata JavaScript diaktifkan, optimasi kinerja akan dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Beberapa fitur pemrosesan huruf dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Pemrosesan huruf Graphite dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Beberapa tipe gambar dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Gambar SVG dinonaktifkan.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript dinonaktifkan di semua situs non-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript bisa diaktifkan per-halaman web melalui tombol NoScript.">
-<!ENTITY torbutton.prefs.sec_high "Tinggi">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript dinonaktifkan di semua situs.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Penampilan beberapa font dan ikon mungkin salah.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Font yang disediakan website diblokir.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Sirkuit Tor untuk situs ini">
diff --git a/is/torbutton.dtd b/is/torbutton.dtd
index 0c420d79f..5b4a3f77e 100644
--- a/is/torbutton.dtd
+++ b/is/torbutton.dtd
@@ -33,30 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "HafÃ°u hakaÃ° Ã Ã¾ennan reit til aÃ° fela fyrir vefsvÃ¦Ã°um atriÃ°i sem gÃ¦tu veriÃ° einstÃ¶k hjÃ¡ Ã¾Ã©r, Ã¾ar meÃ° talin atriÃ°i eins og upplÃ½singar um afkÃ¶st tÃ¶lvunnar, lyklaborÃ°suppsetningu, staÃ°fÃ¦rslu, staÃ°setningu uppsettra viÃ°bÃ³ta, lista yfir uppsettar viÃ°bÃ¦tur, stÃ¶Ã°u netkerfis, stÃ¦rÃ° og stefnu skjÃ¡s, sÃ©rtÃ¦kan aÃ°drÃ¡tt fyrir vefsvÃ¦Ã°i, studdar skrÃ¡ategundir, kerfisliti og getu varÃ°andi WebGL.">
 <!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType aÃ°ferÃ°in viÃ° myndgerÃ° leturs er Ã³virk.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ã? Ã¾essu Ã¶ryggisstigi skal framkvÃ¦ma eftirfarandi 
-breytingar (svÃfa yfir meÃ° bendli til aÃ° sjÃ¡ nÃ¡nar):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 myndskeiÃ° og hljÃ³Ã° verÃ°a virk viÃ° 'smella-til-aÃ°-spila' meÃ° NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Ã? sumum vefsvÃ¦Ã°um gÃ¦tirÃ°u Ã¾urft aÃ° nota NoScript verkfÃ¦rastikuhnappinn til aÃ° virkja Ã¾essa margmiÃ°lunarhluti.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Sumar Javascript afkastabestanir eru Ã³virkar.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, innbyggÃ°ar RegExp-segÃ°ir.">
-<!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_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_medium "MiÃ°lungs">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Ã? vefsvÃ¦Ã°um Ã¾ar sem Javascript er virkt, verÃ°a afkastabestanir Ã³virkar.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Sumar aÃ°ferÃ°ir viÃ° myndgerÃ° leturs eru Ã³virkar.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite aÃ°ferÃ°in viÃ° myndgerÃ° leturs er Ã³virk.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Sumar tegundir mynda eru Ã³virkar.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-myndir eru Ã³virkar.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript er sjÃ¡lfgefiÃ° Ã³virkt Ã¡ Ã¶llum ekki-HTTPS vefjum.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "HÃ¦gt er aÃ° virkja JavaScript fyrir hvert vefsvÃ¦Ã°i meÃ° NoScript-hnappnum Ã¡ verkfÃ¦raslÃ¡.">
-<!ENTITY torbutton.prefs.sec_high "HÃ¡tt">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript er sjÃ¡lfgefiÃ° Ã³virkt Ã¡ Ã¶llum vefsvÃ¦Ã°um.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Sumar tÃ¡knmyndir og letur gÃ¦tu birst Ã³eÃ°lilega.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "LokaÃ° er Ã¡ leturskrÃ¡r sem eiga uppruna sinn Ã¡ vefsvÃ¦Ã°inu.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor-rÃ¡s fyrir Ã¾etta vefsvÃ¦Ã°i">
diff --git a/it/torbutton.dtd b/it/torbutton.dtd
index d5aed79fe..3af29966b 100644
--- a/it/torbutton.dtd
+++ b/it/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Tieni questa casella selezionata per nascondere ai siti web alcune cose che potrebbero essere uniche per te, incluse le prestazioni del computer, la disposizione della tastiera, la lingua, il percorso dei plugin installati, l'elenco dei plugin installati, lo stato di rete, l'orientamento dello schermo, le dimensioni dello schermo, i livelli di zoom per ogni sito, i tipi di file supportati, i colori di sistema e le funzionalitÃ  WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Il Security Slider ti permette di disabilitare determinate funzionalitÃ  del browser che potrebbero renderlo piÃ¹ vulnerabile a tentativi di attacco.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Il meccanismo di rendering SVG OpenType Ã¨ disabilitato.">
-<!ENTITY torbutton.prefs.sec_gen_desc "A questo livello di sicurezza, i seguenti cambiamenti si applicano  a (passa sopra con il mouse per i dettagli):">
-<!ENTITY torbutton.prefs.sec_html5_desc "I video e audio in HTML5 diventano click-to-play grazie a NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Su alcuni siti, potresti dover usare il pulsante toolbar di NoScript per attivare quei media.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Alcune ottimizzazioni di performance JavaScript sono disabilitate.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Alcuni meccanismi di visualizzazione di equazioni matematiche sono disabilitati.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ã¨ disabilitato.">
-<!ENTITY torbutton.prefs.sec_medium "Medio">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Nei siti dove Ã¨ attivato JavaScript le ottimizzazioni sono disabilitate">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Alcuni rendering dei font sono disabilitati.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Il meccanismo di rendering font Graphite Ã¨ disabilitato.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Alcuni tipi di immagini sono disabilitati.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Le immagini SVG sono disabilitate.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript Ã¨ disabilitato di default su tutti i siti non-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript puÃ² essere attivato a seconda del sito usando il pulsante NoScript sulla barra strumenti.">
-<!ENTITY torbutton.prefs.sec_high "Alto">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript Ã¨ disabilitato di default su tutti i siti.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito">
diff --git a/ja/torbutton.dtd b/ja/torbutton.dtd
index e835f141e..b238ecf7c 100644
--- a/ja/torbutton.dtd
+++ b/ja/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "ã?»ã?ã?¥ã?ªã??ã?£ã?»ã?¹ã?©ã?¤ã??ã?¼ã??ä½¿ã?£ã?¦ã??ã??ã?ªã??ã?®ã??ã?©ã?¦ã?¶ã?¼ã??ã??ã??ã?ã?³ã?°ã?®è©¦ã?¿ã?«å¯¾ã??ã?¦ã??ã??è??å¼±ã?«ã??ã??å?¯è?½æ?§ã?®ã??ã??ã??ã?©ã?¦ã?¶ã?¼ã?®æ©?è?½ã??ç?¡å?¹ã?«ã?§ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_low "ä½?ã??(ã??ã??ã?©ã?«ã??)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "æ??å¤§ã?®å?©ä¾¿æ?§ã??æ??ä¾?ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_low_desc "ã??ã?®ã?¬ã??ã?«ã?§ã?¯ã??å?¨ã?¦ã?®ã??ã?©ã?¦ã?¶ã?¼ã?®æ©?è?½ã??æ??å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType ã??ã?©ã?³ã??ã?¬ã?³ã??ã?ªã?³ã?°æ©?è?½ã?¯ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_gen_desc "ã??ã?®ã?¬ã??ã?«ã?§ã?¯ã??ä»¥ä¸?ã?®å¤?æ?´ã??é?©ç?¨ã??ã??ã?¾ã??ã??(ã??ã?¦ã?¹ã??é??ã?ã??ã?¨è©³ç´°ã??è¡¨ç¤º)">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ã?®æ? å??ã?¨é?³æ¥½ã?¯ No-Script ã?«ã??ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¾ã?§å??ç??ã??ã??ã?¾ã??ã??ã??">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "ã??ã??ã?¤ã??ã?®ã?µã?¤ã??ã?§ã?¯ã??ã?¡ã??ã?£ã?¢ã??æ??å?¹ã?«ã??ã??ã??ã??ã?« No-Script ã??ã?¼ã?«ã??ã?¼ã??ä½¿ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "ã??ã??ã?¤ã??ã?® JavaScript ã?®ã??ã??ã?©ã?¼ã??ã?³ã?¹æ??é?©å??ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "å?ºæ?¬ç??ã?ªJITã??">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "ã?µã?¤ã??ã?«ã??ã?£ã?¦ã?¯ã?¹ã?¯ã?ªã??ã??ã?®å??ä½?ã??é??ã??ã?ªã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_mathml_desc "æ?°å¼?ã??è¡¨ç¤ºã??ã??ã??ã??ã?®ã??ã??ã?¤ã??ã?®æ©?è?½ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScriptã??æ??å?¹ã?«ã?ªã?£ã?¦ã??ã??ã?µã?¤ã??ã?§ã??ã??ã??ã?©ã?¼ã??ã?³ã?¹ã?®æ??é?©å??ã??ç?¡å?¹ã?«ã?ªã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "ã??ã??ã?¤ã??ã?®ã??ã?©ã?³ã??ã?¬ã?³ã??ã?ªã?³ã?°æ©?è?½ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite ã??ã?©ã?³ã??ã?¬ã?³ã??ã?ªã?³ã?°æ©?è?½ã?¯ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_svg_desc "ã??ã??ã?¤ã??ã?®ç?»å??ã?®ç¨®é¡?ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG ç?»å??ã?¯ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS ã?§ã?¯ã?ªã??ã?µã?¤ã??ã?® JavaScript ã?¯ã??ã??ã?©ã?«ã??ã?§ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "No-Script ã??ã?¼ã?«ã??ã?¼ã??ã??ã?µã?¤ã??ã??ã?¨ã?« JavaScript ã??æ??å?¹å??ã?§ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_high "é«?ã??">
-<!ENTITY torbutton.prefs.sec_all_js_desc "å?¨ã?¦ã?®ã?µã?¤ã??ã?® JavaScript ã?¯ã??ã??ã?©ã?«ã??ã?§ç?¡å?¹å??ã??ã??ã?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "ã??ã??ã?¤ã??ã?®ã??ã?©ã?³ã??ã?¨ã?¢ã?¤ã?³ã?³ã?¯æ£å¸¸ã?«è¡¨ç¤ºã??ã??ã?¾ã??ã??ã??">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web ã?µã?¤ã??ã??æ??ä¾?ã??ã??ã??ã?©ã?³ã??ã?¯ã??ã?ã??ã?¯ã??ã??ã?¾ã??ã??">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "ã??ã?®ã?µã?¤ã??ç?¨ã?® Tor ã?µã?¼ã?ã??ã??">
diff --git a/jv/torbutton.dtd b/jv/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/jv/torbutton.dtd
+++ b/jv/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ka/torbutton.dtd
+++ b/ka/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/kk/torbutton.dtd b/kk/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/kk/torbutton.dtd
+++ b/kk/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/km/torbutton.dtd b/km/torbutton.dtd
index 3082e8473..c6ea25ab9 100644
--- a/km/torbutton.dtd
+++ b/km/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/kn/torbutton.dtd b/kn/torbutton.dtd
index 79f7c1d71..d697b4cba 100644
--- a/kn/torbutton.dtd
+++ b/kn/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "à²¹à³?à²?à³?à²?à³?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "à²? à²¸à³?à³?à²?à³?à²?à³? à²?à²¾à²°à³? à²¸à²°à³?à²?à³?à²¯à³?à²?à³?">
diff --git a/ko/torbutton.dtd b/ko/torbutton.dtd
index adce6a993..14a24aa5f 100644
--- a/ko/torbutton.dtd
+++ b/ko/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ì?´ ì??ì??ë¥¼ ì²´í?¬ í?´ë? ì?¼ë¡?ì?¨ ì?¹ì?¬ì?´í?¸ê°? ë?¹ì? ì?? ì??ë³? í?  ì?? ì??ë?? ì??ì??ë¥¼ ì?¨ê¸¸ ì?? ì??ì?µë??ë?¤. ê·¸ê²?ì??ë?? ì»´í?¨í?° ì?±ë?¥, í?¤ë³´ë?? ë ?ì?´ì??ì??, ë¡?ì¼?ì?¼, í??ë?¬ê·¸ì?¸ì?´ ì?¤ì¹?ë?? ì?¥ì??, ì?¤ì¹?ë?? í??ë?¬ê·¸ì?¸ì?? ëª©ë¡?, ë?¤í?¸ì??í?¬ ì??í??, í??ë©´ ë°©í?¥, í??ë©´ í?¬ê¸°, ì?¬ì?´í?¸ ë³? í??ë?? / ì¶?ì?? ì??ì¤?, ì§?ì??ë??ë?? í??ì?¼ í??ì??, ì??ì?¤í?? ì??, WebGL ê¸°ë?¥ ë?±ì?´ ì??ì?µë??ë?¤.">
 <!ENTITY torbutton.prefs.sec_caption "ë³´ì?? ë?±ê¸?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "ë³´ì?? ì?¬ë?¼ì?´ë??ë¥¼ ì?¬ì?©í??ë©´ í?¹ì ? ë¸?ë?¼ì?°ì ? ê¸°ë?¥ì?´ ë¹?í??ì?±í?? ë??ì?´ ë¸?ë?¼ì?°ì ?ê°? í?´í?¹ ì??ë??ì?? ì·¨ì?½í?´ì§? ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_low "ë?®ì?? (ê¸°ë³¸)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "ì?´ê²?ì?? ê°?ì?¥ ì? ì?©í?? ì?¬ì?©ì?? ê²½í??ì?? ì ?ê³µí?©ë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_low_desc "ì?´ ë³´ì?? ì??ì¤?ì??ì??ë?? ëª¨ë?  ë¸?ë?¼ì?°ì ? ê¸°ë?¥ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG í?°í?¸ ë ?í?°ë§? ì²´ê³?ê°? ë¹?í??ì?±í??ë??ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_gen_desc "ì?´ ë³´ì?? ì??ì¤?ì??ì??ë?? ë?¤ì??ê³¼ ê°?ì?? ë³?ê²½ ì?¬í?ì?´ ì ?ì?©ë?©ë??ë?¤ (ì??ì?¸í?? ë?´ì?©ì?? ë§?ì?°ì?¤ ì»¤ì?? ì?¬ë¦¬ê¸°).">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ë¹?ë??ì?¤ ë°? ì?¤ë??ì?¤ ë¯¸ë??ì?´ë?? NoScriptë¥¼ í?µí?´ í?´ë¦ í?? ì?¬ì??ì?¼ë¡? ë³?ê²½ë?©ë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "ì?¼ë¶? ì?¬ì?´í?¸ì??ì??ë?? ì?´ë?¬í?? ë¯¸ë??ì?´ ê°?ì²´ë¥¼ ì?¬ì?©í??ë??ë¡? NoScript ë??êµ¬ ëª¨ì?? ë?¨ì¶?ë¥¼ ì?¬ì?©í?´ì?¼ í?  ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "ì?¼ë¶? JavaScript ì?? ì?±ë?¥ ìµ?ì ?í??ê°? ë¹?í??ì?±í??ë??ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline (ë² ì?´ì?¤ë?¼ì?¸) JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "ì?¼ë¶? ì?¬ì?´í?¸ì?? ì?¤í?¬ë¦½í?¸ ë??ì??ì?´ ë??ë ¤ì§? ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "ì??í?? ë°©ì ?ì??ì?? í??ì??í??ë?? ì?¼ë¶? ë©?ì»¤ë??ì¦?ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathMLê°? ë¹?í??ì?±í?? ë??ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_medium "ì¤?ê°?">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScriptê°? í??ì?±í?? ë?? ì?¬ì?´í?¸ì??ì??ë?? ì?±ë?¥ ìµ?ì ?í??ê°? ë¹?í??ì?±í?? ë?©ë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "ì?¼ë¶? í?°í?¸ì?? ë ?í?°ë§?ì?´ ë¹?í??ì?±í??ë??ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite ê¸?ê¼´ ë ?ë??ë§? ë©?ì»¤ë??ì¦?ì?´ ë¹?í??ì?±í?? ë??ì?´ ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_svg_desc "ëª?ëª? ì¢?ë¥?ì?? ì?´ë¯¸ì§?ê°? ë¹?í??ì?±í?? ë??ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG imagesê°? ë¹?í??ì?±í?? ë??ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScriptë?? HTTPSê°? ì ?ì?©ë??ì§? ì??ì?? ì?¬ì?´í?¸ì??ì?  ê¸°ë³¸ì ?ì?¼ë¡? ë¹?í??ì?±í?? ë?©ë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScriptë?? NoScript ë??êµ¬ ëª¨ì?? ë?¨ì¶?ë¥¼ í?µí?´ ì?¬ì?´í?¸ ë³?ë¡? í??ì?±í?? í?  ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_high "ë??ì??">
-<!ENTITY torbutton.prefs.sec_all_js_desc "ì??ë°? ì?¤í?¬ë¦½í?¸ë?? ê¸°ë³¸ ì?¤ì ?ì?¼ë¡? ëª¨ë?  ì?¬ì?´í?¸ì??ì?? ë¹?í??ì?±í?? ë??ì?´ ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "ì?´ë?¤ ê¸?ì?¨ì²´ë?? ì??ì?´ì½?ì?? ì?¬ë°?ë¥´ì§? ì??ê²? í??ì??ë?  ì?? ì??ì?µë??ë?¤.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ì?¬ì?´í?¸ ë?´ì?¥ í?°í?¸ê°? ì°¨ë?¨ë??ì??ì?µë??ë?¤.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "ì?´ ì?¬ì?´í?¸ ì??ì?? ì?? Tor í??ë¡?">
diff --git a/ko_KR/torbutton.dtd b/ko_KR/torbutton.dtd
index 64655ecab..4ae9dc341 100644
--- a/ko_KR/torbutton.dtd
+++ b/ko_KR/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ku/torbutton.dtd b/ku/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ku/torbutton.dtd
+++ b/ku/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ku_IQ/torbutton.dtd b/ku_IQ/torbutton.dtd
index 742d1ed12..1e000eb2b 100644
--- a/ku_IQ/torbutton.dtd
+++ b/ku_IQ/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Ø¨Û?Ø±Ø²">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/kw/torbutton.dtd b/kw/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/kw/torbutton.dtd
+++ b/kw/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ky/torbutton.dtd b/ky/torbutton.dtd
index bd337c146..a54c54a89 100644
--- a/ky/torbutton.dtd
+++ b/ky/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Ð?Ñ?Ñ?Ð¾Ñ?Ð¾">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/la/torbutton.dtd b/la/torbutton.dtd
index 08db13077..9071d7b8d 100644
--- a/la/torbutton.dtd
+++ b/la/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "Linea certitudinis nonnullas possibilitates navis defacere potest, quae navem facilior pro temtationibus faciunt.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Apparatus ostendationis collationum litterarum SVG OpenType deest.">
-<!ENTITY torbutton.prefs.sec_gen_desc "In eo grado certitudinis eae mutationes adsunt (pone murem ibi pro minutaliis):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 imagines mutabiles sonique NoScripte causa mure pressi esse debent pro initio.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "In nonnullis paginis circulum NoScriptis pro licentia earum rerum usare debes.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Nonnulla meliorationis actionum de &quot;JavaScript&quot; desunt.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Nonnulla possibilitates ostendationis formarum mathematicarum desunt.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML deest.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "In paginis, ubi &quot;JavaScript&quot; adest, meliorationes actionum de &quot;JavaScript&quot; desunt.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Nonnulla pparatus ostendationis collationum litterarum deest.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Apparatus ostendationis collationum litterarum Graphite deest.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Nonnulla classes imaginum desunt.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imagines SVG desunt.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "&quot;JavaScript&quot; initiale in omnibus paginis sine HTTPS deest.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "&quot;JavaScript&quot; pro pagina circulo NoScriptis initus esse potest.">
-<!ENTITY torbutton.prefs.sec_high "Super">
-<!ENTITY torbutton.prefs.sec_all_js_desc "&quot;JavaScript&quot; initiale in omnibus paginis deest.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Nonnullae collationes litterarum et imagines false ostentae esse possunt.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Sententiae collationis litterarum de pagina acceptae non sunt.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circulus Tor pro ea pagina">
diff --git a/lb/torbutton.dtd b/lb/torbutton.dtd
index 96e83d468..a88f8de7f 100644
--- a/lb/torbutton.dtd
+++ b/lb/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ass ofgeschalt.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG Biller sinn ausgeschalt.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "HÃ©ich">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript ass standardmÃ©isseg op all SÃ¤it aus.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Den Tor Pad fir des SÃ¤it">
diff --git a/lg/torbutton.dtd b/lg/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/lg/torbutton.dtd
+++ b/lg/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ln/torbutton.dtd b/ln/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ln/torbutton.dtd
+++ b/ln/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/lo/torbutton.dtd b/lo/torbutton.dtd
index 7fd154229..b9b7597ed 100644
--- a/lo/torbutton.dtd
+++ b/lo/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "àº®àº±àº?àºªàº²à»?àº²àº?àº?à»?àºàº?àº?àºµà»?à»?àº§à»? à»?àº?àº·à»?àºà»?àº?àº·à»?àºàº?àºªàº´à»?àº?àº?à»?àº²àº?à»?àº?àº²àº?à»?àº§àº±àº?à»?àº?àº?à»? àº?àºµà»?àºàº²àº?à»?àº?àº±àº?à»?àº«àº¼à»?àº?àº?à»?à»?àº¡àº¹àº?àº?àºàº?à»?àº?à»?àºàº?à»?àº?àº»à»?àº²; àº¥àº§àº¡àº?àº±àº? àº?àº°àºªàº´àº?àº?àº´àº?àº²àº?àº?àºàº?à»?àº?àº·à»?àºàº?à»?àº?àº»à»?àº², à»?àº?à»?àº?àº?àº´àº¡, à»?àº?àº·àºàº?à»?àº²àº?àº?àº±àº?àº?àºµà»?, àº?à»?àºàº?àº?àº´àº?àº?àº±à»?àº?àº?àº»àº§à»?àºªàºµàº¡, àº?àº±àº?àº?àºµàº¥àº²àº?àº?àº²àº?àº?àº»àº§à»?àºªàºµàº¡àº?àºµà»?àº?àº´àº?àº?àº±à»?àº?, àºªàº°àº?àº²àº?àº°à»?àº?àº·àºàº?à»?àº²àº?àº?àºàº?àº?à»?àº²àº?, àº?àº²àº?à»?àº¸àº?à»?à»?àº²àº?à»?, àº?àº°à»?àº²àº?à»?à»?àº²àº?à»?, àº¥àº°àº?àº±àº?àº?àº²àº?àº?àº°àº«àº?àº²àº?à»?à»?àº²à»?àº§àº±àº?àºªàº°à»?àº?àº²àº°, àº?àº²àº?àº¥à»?àº?àºµà»?àºªàº°à»?àº±àº?àºªàº°à»?àº¹àº?, àº¥àº°àº?àº»àº?àºªàºµ, à»?àº¥àº° àº?àº§àº²àº¡àºàº²àº?àºªàº²àº¡àº²àº?àº?àºàº? WebGL .">
 <!ENTITY torbutton.prefs.sec_caption "àº¥àº°àº?àº±àº?àº?àº§àº²àº¡àº?àºàº?à»?àº?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "àº?àº§àº²àº¡àº?àºàº?à»?àº? Slider àºàº°àº?àº¸àº?àº²àº?à»?àº«à»?àº?à»?àº²àº? àº?àº´àº?àº?àº¸àº?àºªàº»àº¡àº?àº±àº?àº?àº»àº§àº?à»?àºàº?à»?àº§àº±àº?àº?àº²àº?àº?àº»àº§à»?àº?à»?àº¶à»?àº? à»?àº?àº´à»?àº?àºàº²àº?àº?àº°à»?àº®àº±àº?à»?àº«à»?àº?àº»àº§àº?à»?àºàº?à»?àº§àº±àº? àº?àºàº?àº?à»?àº²àº? àº¡àºµàº?àº§àº²àº¡àºªà»?àº½àº?àº«àº¼àº²àº?àº?àºµà»?àº?àº°àº?àº·àº? à»?àº?àº²àº°à»?àº?àº»à»?àº²àº¡àº².">
-<!ENTITY torbutton.prefs.sec_low "àº?à»?à»?àº² (àº?àº²àº¡àº?à»?àº²à»?àº?àºµàº¡)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "àº?àºµà»?àº?àº°àºªàº°à»?àºàº?àº?àº°àºªàº»àº?àº?àº²àº?àº?àºµà»?àº¡àº±àº?à»?àº?à»?à»?àº¥àº·à»?àºàº?.">
-<!ENTITY torbutton.prefs.sec_low_desc "àº?àº§àº²àº¡àº?àºàº?à»?àº?àº¢àº¹à»?àº¥àº°àº?àº±àº?àº?àºµà»? àº?àº°àºàº°àº?àº¸àº?àº²àº?à»?àº«à»?àº?àº¸àº?à»?àº?àº·à»?àºàº?àº¡àº·à»?àº?à»?àº?àº²àº?à»?àº?à»?.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "àº?àº»àº?à»?àº?àºªà»?àº²àº?àº®àº¹àº?à»?àº?àº?à»?àº?à»?àº±àº?àºªàº· SVG OpenType àº?àºµà»?àº?àº·àº?àº?àº´àº?àº?àº²àº?à»?àº?à»?àº?àº²àº?">
-<!ENTITY torbutton.prefs.sec_gen_desc "àº¥àº°àº?àº±àº?àº?àº§àº²àº¡àº?àºàº?à»?àº?àº¢àº¹à»?àº?àº±à»?àº?àº?àºµà»?, àº?àº²àº?àº?à»?àº½àº?à»?àº?àº?àº?à»?à»?à»?àº?àº?àºµà»?àº?àº°àº?àº·àº?àº?àº±àº?à»?àº«à»?àº¡àºµàº?àº»àº? (à»?àº¥àº·à»?àºàº?àº¡àº²àº§àºªà»?à»?àº?àº?àº±àº?à»?àº?àº·à»?àºàº®àº¹à»?àº¥àº²àº?àº¥àº°àºàº½àº?):">
-<!ENTITY torbutton.prefs.sec_html5_desc "àº§àºµà»?àº?à»?àº à»?àº¥àº° àºªàº½àº? HTML5 àº?àº²àº?à»?àº?àº±àº? click-to-play à»?àº?àº?àº?à»?àº²àº? NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "àº¢àº¹à»?àº?àº²àº?à»?àº§àº±àº?à»?àº?, àº?à»?àº²àº?àºàº²àº?àº?à»?àº²à»?àº?àº±àº?àº?à»?àºàº?àº?àº²àº?à»?àº?à»? àº?àº¸à»?àº¡à»?àº?àº?à»?àº?àº·à»?àºàº?àº¡àº· NoScript à»?àº?àº·à»?àºà»?àº?à»?àº?àº²àº?àº§àº±àº?àº?àº¸àºªàº·à»?à»?àº«àº¼àº»à»?àº²àº?àºµà»?.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "àº?àº²àº? àº?àº°àºªàº´àº?àº?àº´àº?àº²àº?àº?àº²àº?àº?àº³àº?àº²àº?àº?àºàº? JavaScript àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, RegExp à»?àº?àº?àº?àº±à»?àº?à»?àº?àºµàº¡.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "àºªàº°àº?àº£àº´àº? àº¢àº¹à»?àº?àº²àº?à»?àº§àº±àº?à»?àº?àºàº²àº?à»?àº®àº±àº?àº§àº½àº?àº«àº¼àº·à»?àº¥à»?àº?àº?à»?àº²àº?àº§à»?àº².">
-<!ENTITY torbutton.prefs.sec_mathml_desc "àº?àº»àº?à»?àº?àº?àº²àº?àºªà»?àº§àº?àº?àºàº?àº?àº²àº?àºªàº°à»?àº?àº?àºªàº»àº¡àº?àº»àº?àº?àº²àº?àº?àº°àº?àº´àº?àºªàº²àº?àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
-<!ENTITY torbutton.prefs.sec_medium "àº?àº°à»?àº²àº?àº?àº²àº?">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "àº¢àº¹à»?à»?àº§àº±àº?à»?àº?àº?à»? àº?àºµà»? àº?àº²àº§àº²àºªàº°àº?àº£àº´àº? à»?àº?àºµàº?à»?àº?à»?àº?àº²àº?àº¢àº¹à»? àº?àº²àº?àº?àº±àº?àºªàº°àº¡àº±àº?àº?àº°àº?àº²àº?à»?àº«à»?àºªàº»àº¡àº?àº¹àº? à»?àº?à»?àº?àº·àº?àº?àº´àº?à»?àº§à»?.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "àº?àº¸àº?àºªàº»àº¡àº?àº±àº?àº?àº²àº?àºªàº°à»?àº?àº?à»?àº?àºàº±àº?àºªàºàº?àº?àº²àº?à»?àº?àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "àº?àº»àº?à»?àº?àº?àº²àº?àºªàº°à»?àº?àº?à»?àº?àºàº±àº?àºªàºàº? Graphite àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
-<!ENTITY torbutton.prefs.sec_svg_desc "àº®àº¹àº?àº?àº²àº?àº?àº°à»?àº?àº?à»?àº?à»?àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "àº®àº¹àº? à»?àº?àº? SVG àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº?à»?àº?àº?àº?à»?àº²à»?àº¥àºµà»?àº¡à»?àº?àºµàº¡à»?àº?àº?àº¸àº?à»?àº§àº±àº? àº?àºµà»?àº?à»?à»?àº¡àºµ HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript àºªàº²àº¡àº²àº?à»?àº?àºµàº?à»?àº?à»?àº?àº²àº?à»?àº?à»? à»?àº?àº´àº?à»?àº?àº?à»? à»?àº?àº?àº?àº·à»?àº?àº?àº²àº? à»?àº?àº?àº?à»?àº²àº? àº?àº¸à»?àº¡àº?à»?àº²àºªàº±à»?àº? NoScript.">
-<!ENTITY torbutton.prefs.sec_high "àºªàº¹àº?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript àº?àº·àº?àº?àº´àº?à»?àº?à»?àº?àº²àº? à»?àº?àº?àº?à»?àº²à»?àº?àºµàº¡ à»?àº?àº´àº?à»?àº§àº±àº?à»?àº?àº?àº±àº?à»?àº»àº?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "àº?àº²àº?àº®àº¹àº?à»?àº?àº?à»?àº?à»?àº±àº?àºªàº· à»?àº¥àº° àº?àº¸à»?àº¡àº¥àº±àº?à»?àºàº?àº±àºàº? àºàº²àº?àºªàº°à»?àº?àº?àºàºàº?àº¢à»?àº²àº?àº?à»?à»?àº?àº·àº?àº?à»?àºàº?">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "àº?àº²àº?àº¥à»? àº®àº¹àº?à»?àº?àº?à»?àº?à»?àº±àº?àºªàº· àº?àºµà»?à»?àº§àº±àº?à»?àº?àº?à»?àºªàº°à»?àºàº?à»?àº«à»? àº?àº·àº?àº¥àº±àº?à»?àº§à»?.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "àº§àº»àº?àº?àºàº? Tor àºªàº³àº¥àº±àº?à»?àº§àº±àº?à»?àº?àº?àºµà»?">
diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd
index ca2c37099..1863e56c0 100644
--- a/lt/torbutton.dtd
+++ b/lt/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Palikite Å¡Ä¯ langelÄ¯ paÅ¾ymÄ?tÄ?, kad paslÄ?ptumÄ?te nuo svetainiÅ³ informacijÄ?, kuri apie jus gali bÅ«ti unikali, Ä¯skaitant jÅ«sÅ³ kompiuterio naÅ¡umÄ?, klaviatÅ«ros iÅ¡dÄ?stymÄ?, lokalÄ?, Ä¯diegtÅ³ Ä¯skiepiÅ³ vietÄ?, Ä¯diegtÅ³ Ä¯skiepiÅ³ sÄ?raÅ¡Ä?, jÅ«sÅ³ tinklo bÅ«senÄ?, ekrano orientacijÄ?, ekrano dydÄ¯, specifiniÅ³ svetainiÅ³ mastelio lygius, palaikomus failo tipus, sistemos spalvas ir WebGL galimybes.">
 <!ENTITY torbutton.prefs.sec_caption "Saugumo lygmuo">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Saugumo slankiklis leidÅ¾ia jums iÅ¡jungti tam tikras narÅ¡yklÄ?s ypatybes, kurios gali padaryti jÅ«sÅ³ narÅ¡yklÄ? labiau paÅ¾eidÅ¾iamÄ? bandymams Ä¯sibrauti.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType Å¡riftÅ³ atvaizdavimo mechanizmas yra iÅ¡jungtas.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Å iame saugumo lygmenyje, taikomi Å¡ie pakeitimai (uÅ¾veskite pelÄ?, iÅ¡samesnei informacijai):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 vaizdo Ä¯raÅ¡ai ir garsai NoScript pagalba tapo click-to-play.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Kai kuriose svetainÄ?se, norint Ä¯jungti Å¡iuos medijos objektus, gali reikÄ?ti panaudoti NoScript Ä¯rankiÅ³ juostos mygtukÄ?.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Kai kurie JavaScript naÅ¡umo optimizavimai yra iÅ¡jungti.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Vidutinis">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "SvetainÄ?se, kuriose JavaScript yra Ä¯jungtas, naÅ¡umo optimizavimai yra iÅ¡jungti.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Kai kurios Å¡riftÅ³ atvaizdavimo ypatybÄ?s yra iÅ¡jungtos.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite Å¡riftÅ³ atvaizdavimo mechanizmas yra iÅ¡jungtas.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Kai kurie paveikslÅ³ tipai yra iÅ¡jungti.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG paveikslai yra iÅ¡jungti.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "Pagal numatymÄ?, JavaScript yra iÅ¡jungtas visuose ne-HTTPS svetainÄ?se.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Kiekvienoje atskiroje svetainÄ?je JavaScript galima Ä¯jungti, naudojant NoScript Ä¯rankiÅ³ juostos mygtukÄ?.">
-<!ENTITY torbutton.prefs.sec_high "AukÅ¡tas">
-<!ENTITY torbutton.prefs.sec_all_js_desc "Pagal numatymÄ?, Javascript yra iÅ¡jungtas visose svetainÄ?se.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Kai kurie Å¡riftai ir piktogramos gali bÅ«ti rodomos neteisingai.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Tinklalapio teikiami Å¡riftai blokuojami.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor grandinÄ? Å¡iam tinklalapiui.">
diff --git a/lv/torbutton.dtd b/lv/torbutton.dtd
index 2565fe9f8..2e9b8a423 100644
--- a/lv/torbutton.dtd
+++ b/lv/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "AtstÄ?jiet lodziÅ?Ä? atzÄ«mi, lai neizpaustu mÄ?jaslapÄ?s to informÄ?ciju, kas varÄ?tu bÅ«t Jums unikÄ?la, tostarp informÄ?ciju par datora veiktspÄ?ju, tastatÅ«ras izkÄ?rtojumu, lokalizÄ?ciju, instalÄ?to spraudÅ?u atraÅ¡anÄ?s vietu un sarakstu, JÅ«su tÄ«kla statusu, ekrÄ?na orientÄ?ciju, ekrÄ?na izmÄ?ru, vietai konkrÄ?tos tÄ?lummaiÅ?as parametrus, atbalstÄ«tos datÅ?u veidus, sistÄ?mas krÄ?sas un WebGL iepÄ?jas.">
 <!ENTITY torbutton.prefs.sec_caption "DroÅ¡Ä«bas lÄ«menis">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Security Slider jeb DroÅ¡Ä«bas slÄ«dnis Ä¼auj Jums atspÄ?jot tÄ?s pÄ?rlÅ«ka iezÄ«mes, kas padara JÅ«su pÄ?rlÅ«ku ievainojamÄ?ku datorpirÄ?tisma mÄ?Ä£inÄ?jumiem.">
-<!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. ">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Ir atspÄ?jots SVG OpenType fontu renderÄ?Å¡anas mehÄ?nisms. ">
-<!ENTITY torbutton.prefs.sec_gen_desc "Å ajÄ? droÅ¡Ä«bas lÄ«menÄ« ir spÄ?kÄ? turpmÄ?k uzskaitÄ«tÄ?s izmaiÅ?as (lai uzzinÄ?tu vairÄ?k pÄ?rbrauciet ar peli): ">
-<!ENTITY torbutton.prefs.sec_html5_desc "Ar NoScript HTML5 video un audio multividi pÄ?rveido par atskaÅ?oÅ¡anai noklikÅ¡Ä·inÄ?mu.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "DaÅ¾Ä?s vietnÄ?s Jums, iespÄ?jams, vajadzÄ?s izmantot NoScript rÄ«kjoslu, lai iespÄ?jotu Å¡os multivides objektus.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Ir atspÄ?jotas daÅ¾as JabaScript veiktspÄ?jas optimizÄ?cijas. ">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "VidÄ?js">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "VietnÄ?m, kurÄ?s ir iespÄ?jots JavaScript, ir atspÄ?jota veiktspÄ?jas optimizÄ?cija.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Ir atspÄ?jotas daÅ¾as fontu renderÄ?Å¡anas iezÄ«mes.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Ir atspÄ?jots fintu renderÄ?Å¡anas mehÄ?nisms Graphite.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Ir atspÄ?joti daÅ¾i attÄ?lu veidi.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Ir atspÄ?joti SVG attÄ?li.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "VisÄ?s ne-HTTPS vietnÄ?s JavaScript ir atspÄ?jots pÄ?c noklusÄ?juma.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Ar NoScript rÄ«kjoslas pogu individuÄ?lai vietnei var iespÄ?jot JavaScript.">
-<!ENTITY torbutton.prefs.sec_high "Augsts">
-<!ENTITY torbutton.prefs.sec_all_js_desc "PÄ?c noklusÄ?juma visÄ?s vietnÄ?s ir atspÄ?jots JavaScript.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "DaÅ¾i fonti un ikoni var tikt attÄ?loti nepareizi.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Tiek bloÄ·Ä?tas tÄ«mekÄ¼a lapu sniegtÄ?s fontu datnes.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Å Ä«s vietnes Tor marÅ¡ruts">
diff --git a/mg/torbutton.dtd b/mg/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/mg/torbutton.dtd
+++ b/mg/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/mi/torbutton.dtd b/mi/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/mi/torbutton.dtd
+++ b/mi/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/mk/torbutton.dtd b/mk/torbutton.dtd
index 41173013f..1f2525dd7 100644
--- a/mk/torbutton.dtd
+++ b/mk/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ml/torbutton.dtd b/ml/torbutton.dtd
index 3555950f9..5da9dd55c 100644
--- a/ml/torbutton.dtd
+++ b/ml/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "à´? à´¸àµ?à´°à´?àµ?à´·à´¾ à´¤à´²à´¤àµ?à´¤à´¿àµ½, à´?à´²àµ?à´²à´¾ à´¬àµ?à´°àµ?àµ?à´¸àµ¼ à´¸à´µà´¿à´¶àµ?à´·à´¤à´?àµ¾ à´ªàµ?à´°à´¾à´ªàµ?à´¤à´®à´¾à´?àµ?à´?à´¿.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "à´?à´¸àµ?.à´µà´¿.à´?à´¿. à´?à´ªàµ?à´ªà´£àµ?à´?àµ?à´ªàµ?à´ªàµ? à´«àµ?à´¾à´£àµ?à´?àµ?à´®àµ?à´?àµ?à´?à´¾à´¨à´¿à´¸à´? à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¨à´°à´¹à´¿à´¤à´®à´¾à´?àµ?à´?.">
-<!ENTITY torbutton.prefs.sec_gen_desc "à´?à´?à´¤àµ?à´¤à´°à´?-à´²àµ?à´¾ :-  à´? à´¸àµ?à´°à´?àµ?à´·à´¾ à´¤à´²à´¤àµ?à´¤à´¿àµ½, à´¤à´¾à´´àµ? à´®à´¾à´±àµ?à´±à´?àµ?à´?àµ¾ à´¬à´¾à´§à´?à´®à´¾à´¯à´¿à´°à´¿à´?àµ?à´?àµ?à´? (à´µà´¿à´¶à´¦à´¾à´?à´¶à´?àµ?à´?àµ¾à´?àµ?à´?à´¾à´¯à´¿ à´®àµ?à´¸àµ? à´?à´µàµ¼) ">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 à´µàµ?à´¡à´¿à´¯àµ?à´¾, à´?à´¡à´¿à´¯àµ?à´¾ à´®àµ?à´¡à´¿à´¯à´¾ à´?àµ?à´²à´¿à´?àµ?à´?àµ?-à´?àµ?-à´ªàµ?à´²àµ?  à´¸àµ?à´?àµ?à´°à´¿à´ªàµ?à´±àµ?à´±àµ? à´µà´´à´¿">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "à´?à´¿à´² à´¸àµ?à´±àµ?à´±àµ?à´?à´³à´¿àµ½, à´¨à´¿à´?àµ?à´?àµ¾ à´? à´®àµ?à´¡à´¿à´¯ à´µà´¸àµ?à´¤àµ?à´?àµ?à´?à´³à´¾à´¯ à´ªàµ?à´°à´¾à´ªàµ?à´¤à´®à´¾à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ? No-Script à´¬à´?àµ?à´?àµº à´?à´ªà´¯àµ?à´¾à´?à´¿à´?àµ?à´?à´¾o.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline à´?àµ?à´?à´?à´¿.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "à´?à´¿à´² à´¸àµ?à´±àµ?à´±àµ?à´?à´³à´¿àµ½ à´¸àµ?à´?àµ?à´°à´¿à´ªàµ?à´±àµ?à´±àµ?à´?àµ¾ à´ªà´¤à´¿à´¯àµ? à´?àµ?à´¯àµ?à´¯à´¾à´µàµ?à´¨àµ?à´¨à´¤à´¾à´£àµ?.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "à´?à´£à´¿à´¤ à´¸à´®à´µà´¾à´?àµ?à´¯à´?àµ?à´?àµ¾ à´ªàµ?à´°à´¦àµ¼à´¶à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´¿à´² à´?à´µà´¯à´¿à´²àµ?à´¾à´¨àµ?à´¨à´¾à´£àµ? à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¨à´°à´¹à´¿à´¤à´®à´¾à´£àµ?.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¨à´°à´¹à´¿à´¤à´®à´¾à´?àµ?à´?à´¿.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "à´?à´¿à´² à´«àµ?à´¾à´£àµ?à´?àµ? à´¤àµ¼à´?àµ?à´?à´® à´¸à´µà´¿à´¶àµ?à´·à´¤à´?àµ¾ à´?à´ªàµ?à´°à´¾à´ªàµ?à´¤à´®à´¾à´?àµ?à´?à´¿à´¯à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "à´®àµ?à´?àµ?à´?à´¾à´¨à´¿à´¸à´? à´¤àµ¼à´?àµ?à´?à´® à´?àµ?à´°à´¾à´«àµ?à´±àµ?à´±àµ? à´«àµ?à´¾à´£àµ?à´?àµ? à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¨à´°à´¹à´¿à´¤à´®à´¾à´?àµ?à´?.">
-<!ENTITY torbutton.prefs.sec_svg_desc " à´?à´¿à´² à´?à´¿à´¤àµ?à´°à´?àµ?à´?àµ¾ à´?à´ªàµ?à´°à´¾à´ªàµ?à´¤à´®à´¾à´?àµ?à´?à´¿.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "à´?à´¸àµ?.à´µà´¿.à´?à´¿.à´¯àµ?à´?àµ?à´?àµ?à´³àµ?à´³ à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¨à´°à´¹à´¿à´¤à´®à´¾à´£àµ?.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "à´?à´²àµ?à´²à´¾ à´¨àµ?à´¾àµº JavaScript  à´¸àµ?à´µà´¤à´µàµ?  -https à´¸àµ?à´±àµ?à´±àµ?à´?à´³à´¿àµ½à´°à´¹à´¿à´¤à´®à´¾à´?àµ?à´?à´¿à´¯à´¿à´°à´¿à´¯àµ?à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "NoScript à´¬à´?àµ?à´?àµº à´µà´´à´¿ à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? à´¸àµ?à´±àµ?à´±àµ?à´?à´¾à´µà´¾à´¸àµ?à´?àµ?à´°à´¿à´ªàµ?à´±àµ?à´±àµ? à´?à´?à´¿à´¸àµ?à´¥à´¾à´¨à´¤àµ?à´¤à´¿àµ½ à´ªàµ?à´°à´¾à´ªàµ?à´¤à´®à´¾à´?àµ?à´?à´¿à´¯ à´?à´´à´¿à´¯àµ?à´?.">
-<!ENTITY torbutton.prefs.sec_high "à´?àµ?à´?àµ?à´¤àµ½">
-<!ENTITY torbutton.prefs.sec_all_js_desc "à´?à´²àµ?à´²à´¾ à´¸àµ?à´±àµ?à´±àµ?à´?à´³à´¿àµ½ JavaScript  à´¸àµ?à´µà´¤à´µàµ? à´°à´¹à´¿à´¤à´®à´¾à´?àµ?à´?à´¿à´¯à´¿à´°à´¿à´¯àµ?à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "à´?à´¿à´² à´«àµ?à´¾à´£àµ?à´?àµ?à´?àµ¾ à´?à´?àµ?à´?à´£àµ?à´?à´³àµ?à´? à´¤àµ?à´±àµ?à´±à´¾à´¯à´¿ à´ªàµ?à´°à´¦àµ¼à´¶à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´?à´¯àµ?à´? à´?àµ?à´¯àµ?à´¯àµ?à´¨àµ?à´¨àµ?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip " à´«à´¯à´²àµ?à´?àµ¾ à´¤à´?à´?àµ?à´?àµ? à´µàµ?à´¬àµ?à´¸àµ?à´±àµ?à´±àµ?-à´¨àµ½à´?à´¿à´¯ à´«àµ?à´¾à´£àµ?à´?àµ?.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "à´? à´¸àµ?à´±àµ?à´±à´¿à´¨à´¾à´¯à´¿ à´?àµ?à´¾àµ¼ à´¸àµ¼à´?àµ?à´¯àµ?à´?àµ?à´?àµ?">
diff --git a/mn/torbutton.dtd b/mn/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/mn/torbutton.dtd
+++ b/mn/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/mr/torbutton.dtd b/mr/torbutton.dtd
index 05774a10e..327d86739 100644
--- a/mr/torbutton.dtd
+++ b/mr/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "à¤?à¤?à¥?à¤?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ms_MY/torbutton.dtd b/ms_MY/torbutton.dtd
index 2f566dc95..b3b36859b 100644
--- a/ms_MY/torbutton.dtd
+++ b/ms_MY/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/mt/torbutton.dtd b/mt/torbutton.dtd
index 73d7b1f10..0fa98f4c4 100644
--- a/mt/torbutton.dtd
+++ b/mt/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/my/torbutton.dtd b/my/torbutton.dtd
index 9d31bcc24..b6673fa41 100644
--- a/my/torbutton.dtd
+++ b/my/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 á??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?»á??á?ºá?¡á?¬á?¸á??á?¯á?¶á?¸á??á?á?¯ á??á?½á??á?ºá?·á??á?¼á?¯á??á?¬á?¸á??á?«á??á??á?ºá??">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "á?¤á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¸á?¡á??á??á?ºá?·á??á?½á??á?º á?¡á?±á?¬á??á?ºá??á?«á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?¾á?¯á??á?»á?¬á?¸á??á?á?¯á??á?« á??á?±á?¬á??á?ºá??á?½á??á?ºá??á??á?ºá??á?¼á??á?ºá??á??á?º (á?¡á??á?±á?¸á??á?á??á?ºá??á?á??á?¾á?á??á??á?º á??á?±á?¬á??á?ºá??á?ºá??á?¬á??á?¬á??á?á?¯á??á?½á?¾á?±á?·á??á?«)">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "á?¡á??á?»á?á?¯á?·á??á?±á?¬ JavaScript á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á?¡á?¬á?¸ á??á?¼á??á?ºá??á??á?ºá??á?½á??á?ºá?·á??á?á??á?ºá??á?¬á?¸á??á?«á??á??á?ºá??">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "á?¡á??á??á?ºá?¡á??á??á?º">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "á?¤á??á?á?¯á??á?ºá?¡á??á?½á??á?º Tor á??á??á?ºá??á??á?ºá?¸">
diff --git a/nah/torbutton.dtd b/nah/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/nah/torbutton.dtd
+++ b/nah/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/nap/torbutton.dtd b/nap/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/nap/torbutton.dtd
+++ b/nap/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/nb/torbutton.dtd b/nb/torbutton.dtd
index 0c9830903..c9ac958c8 100644
--- a/nb/torbutton.dtd
+++ b/nb/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "La denne avkryssingsboksen vÃ¦re utkrysset for Ã¥ skjule ting som kan vÃ¦re unikt med deg fra nettsteder, inkludert datamaskinens ytelse, tastaturoppsett , lokale, plasseringen av- og listen over  installerte programtillegg, nettverksstatus, skjermretning , skjermstÃ¸rrelse , sidespesifikke forstÃ¸rrelsesnivÃ¥er , filtyper som stÃ¸ttes, systemfarger og WebGL-evner.">
 <!ENTITY torbutton.prefs.sec_caption "SikkerhetsnivÃ¥">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Sikkerhetsglidebryteren lar deg skru av forskjellige nettleserfunksjoner som kan eksponere deg for risiko.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG-OpenType-font tegningsmekanisme avskrudd.">
-<!ENTITY torbutton.prefs.sec_gen_desc "PÃ¥ dette sikkerhetsnivÃ¥et vil  fÃ¸lgende forandringene bli brukt (mus over for detaljer):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5- video og -lydmedia vil bli klikk-for-spille-av via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "PÃ¥ noen sider kan du trenge NoScript-verktÃ¸ylinjeknappen for Ã¥ aktivere disse media-objektene.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Noen ytelsesforbedringer for JavaScript er avskrudd.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, lokal RegExp.">
-<!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_mathml_desc "Noen mekanismer for Ã¥ vise matteformler er skrudd av.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML er avskrudd.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "PÃ¥ sider der JavaScript er pÃ¥skrudd, vil ytelsesforbedringer vÃ¦re avskrudd.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Noen fonttegningsfunksjoner er avskrudd.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite font-visningsmekanismen er skrudd av.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Noen typer bilder er avskrudd.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder er avskrudd.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript er avskrudd som forvalg pÃ¥ alle sider som ikke er HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Javascript kan skrus pÃ¥ per side via NoScript-funksjonsknappen.">
-<!ENTITY torbutton.prefs.sec_high "HÃ¸y">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript er som forvalg slÃ¥tt av for alle nettsteder.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Noen fonter og miniatyrbilder vises kanskje ikke riktig.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fonter som kommer fra nettsiden er blokkert.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor-krets for denne siden">
diff --git a/nds/torbutton.dtd b/nds/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/nds/torbutton.dtd
+++ b/nds/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ne/torbutton.dtd b/ne/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ne/torbutton.dtd
+++ b/ne/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index cce0b9d7c..333e5f1cf 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Houd deze box aangevinkt om dingen te verbergen voor website die uniek kunnen zijn voor u, inclusief uw computer prestaties, toetsenbord layout, locatie, de locatie van geÃ¯nstalleerde plugins, de lijst van geÃ¯nstalleerde plugins, uw netwerk status, scherm oriÃ«ntatie, scherm grootte, site-specifieke zoom levels, ondersteunde bestands types, systeem kleuren, en WebGL mogelijkheden.">
 <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "De beveiligingsschuifbalk laat je toe sommige functies uit te schakelen die je browser mogelijk blootstellen aan beveiligingsrisico's.">
-<!ENTITY torbutton.prefs.sec_low "Laag (standaard)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "Dit biedt de meest bruikbare ervaring.">
-<!ENTITY torbutton.prefs.sec_low_desc "Op dit beveiligingsniveau worden alle browserfuncties ingeschakeld.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Het SVG OpenType-mechanisme voor weergave van lettertypen is uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Op dit beveiligingsniveau gelden de volgende wijzigingen (beweeg de muis over de items voor meer informatie):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5-video en -audio worden klik-om-af-te-spelen via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites moet je de NoScript-werkbalkknop gebruiken om deze media-objecten in te schakelen.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Sommige JavaScript-prestatieverbeteringen zijn uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Sommige mechanismen voor het weergeven van wiskundige vergelijkingen zijn uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Op sites die JavaScript toestaan zijn de prestatieverbeteringen uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Sommige functies voor weergave van lettertypen zijn uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Het Graphite-weergavemechanisme voor lettertypen is uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Sommige afbeeldingstypen zijn uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG afbeeldingen zijn uitgeschakeld.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is standaard uitgeschakeld op alle niet-HTTPS-websites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan worden ingeschakeld op een site-basis via de NoScript-werkbalkknop.">
-<!ENTITY torbutton.prefs.sec_high "Hoog">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is standaard uitgeschakeld op alle websites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Sommige lettertypen en pictogrammen worden mogelijk niet goed weergegeven. ">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypen worden geblokkeerd.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor-circuit voor deze website">
diff --git a/nl_BE/torbutton.dtd b/nl_BE/torbutton.dtd
index cae595d12..809980659 100644
--- a/nl_BE/torbutton.dtd
+++ b/nl_BE/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/nn/torbutton.dtd b/nn/torbutton.dtd
index 40bcdf962..c5e60d000 100644
--- a/nn/torbutton.dtd
+++ b/nn/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "HÃ¸g">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/nso/torbutton.dtd b/nso/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/nso/torbutton.dtd
+++ b/nso/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/oc/torbutton.dtd b/oc/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/oc/torbutton.dtd
+++ b/oc/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/om/torbutton.dtd b/om/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/om/torbutton.dtd
+++ b/om/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/or/torbutton.dtd b/or/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/or/torbutton.dtd
+++ b/or/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/pa/torbutton.dtd b/pa/torbutton.dtd
index 1c153b088..afaca1d33 100644
--- a/pa/torbutton.dtd
+++ b/pa/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/pap/torbutton.dtd b/pap/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/pap/torbutton.dtd
+++ b/pap/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/pl/torbutton.dtd b/pl/torbutton.dtd
index 085d05fab..5ea9250d7 100644
--- a/pl/torbutton.dtd
+++ b/pl/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Zachowaj to pole zaznaczone, aby ukryÄ? przed stronami internetowymi elementy, ktÃ³re mogÄ? byÄ? u ciebie unikalne, wliczajÄ?c w to wydajnoÅ?Ä? komputera, ukÅ?ad klawiatury, lokalizacjÄ?, poÅ?oÅ¼enie zainstalowanych wtyczek, listÄ? zainstalowanych wtyczek, stan sieci, orientacjÄ? ekranu, rozmiar ekranu, okreÅ?lone poziomy powiÄ?kszenia, obsÅ?ugiwane typy plikÃ³w, kolory systemu oraz moÅ¼liwoÅ?ci WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeÅ?stwa">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Suwak poziomu bezpieczeÅ?stwa pozwala na wyÅ?Ä?czenie pewnych funkcji przeglÄ?darki, ktÃ³re mogÄ? uczyniÄ? ten program bardziej naraÅ¼onym na prÃ³by ataku hakerskiego.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Mechanizm SVG OpenType renderowania czcionek jest wyÅ?Ä?czony.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Na tym poziomie bezpieczeÅ?stwa, stosuje siÄ? nastÄ?pujÄ?ce zmiany (najedÅº kursorem po wiÄ?cej szczegÃ³Å?Ã³w): ">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video oraz audio bÄ?dÄ? dostÄ?pne jako 'kliknij-aby-otworzyÄ?' przez NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Na niektÃ³rych stronach internetowych bÄ?dziesz musiaÅ? uÅ¼yÄ? przycisku NoScript znajdujÄ?cym siÄ? w pasku narzÄ?dzi, aby wÅ?Ä?czyÄ? dane obiekty medialne.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "NiektÃ³re optymalizacje wydajnoÅ?ci JavaScript sÄ? wyÅ?Ä?czone.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Å?redni">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Na stronach, na ktÃ³rych wÅ?Ä?czony jest JavaScript optymalizacje wydajnoÅ?ci sÄ? wyÅ?Ä?czone.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "NiektÃ³re funkcje renderingu czcionki sÄ? wyÅ?Ä?czone.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Mechanizm Graphite do renderowania czcionki jest wyÅ?Ä?czony.">
-<!ENTITY torbutton.prefs.sec_svg_desc "NiektÃ³re typy obrazÃ³w sÄ? wyÅ?Ä?czone.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Obrazy SVG sÄ? wyÅ?Ä?czone.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript jest wyÅ?Ä?czone domyÅ?lnie dla wszystkich stron ktÃ³re nie sÄ? HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript moÅ¼e byÄ? wÅ?Ä?czony dla pojedyÅ?czych, wybranych przez Ciebie stronach uÅ¼ywajÄ?c przycisku NoScript z paska narzÄ?dzi.">
-<!ENTITY torbutton.prefs.sec_high "Wysoki">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript jest domyÅ?lnie wyÅ?Ä?czona na wszystkich stronach.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "NiektÃ³re czcionki i ikony mogÄ? byÄ? wyÅ?wietlane niepoprawnie.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Pliki czcionek dostarczane przez strony internetowe sÄ? blokowane.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "ObwÃ³d Tor dla tej strony">
diff --git a/pms/torbutton.dtd b/pms/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/pms/torbutton.dtd
+++ b/pms/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ps/torbutton.dtd b/ps/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ps/torbutton.dtd
+++ b/ps/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd
index b1358ea5f..f439b2ede 100644
--- a/pt/torbutton.dtd
+++ b/pt/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "O Cursor de SeguranÃ§a deixa-o desativar algumas funcionalidades do navegador que pode tornar o mesmo mais vulnerÃ¡vel a tentativas de pirataria.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "O mecanismo de renderizaÃ§Ã£o do tipo de letra OpenType SVG estÃ¡ desativado.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Neste nÃvel de seguranÃ§a, aplicam-se as seguintes alteraÃ§Ãµes ('rato sobre' para os detalhes).">
-<!ENTITY torbutton.prefs.sec_html5_desc "A multimÃ©dia de Ã¡udio e vÃdeo HTML5 torna-se clique-par-reproduzir via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sites, poderÃ¡ precisar de utilizar o botÃ£o da barra de ferramentas NoScript para ativar estes objetos de multimÃ©dia.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Algumas otimizaÃ§Ãµes de desempenho JavaScript estÃ£o desativadas.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "JIT ION, RegExp Nativo.">
-<!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_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_medium "MÃ©dio">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Nos sites onde o JavaScript estÃ¡ ativado, as otimizaÃ§Ãµes de desempenho estÃ£o desativadas.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Algumas funÃ§Ãµes de renderizaÃ§Ã£o do tipo de letra estÃ£o desativadas.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "O mecanismo de renderizaÃ§Ã£o do tipo de letra Graphite estÃ¡ desativado.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipos de imagens estÃ£o desativados.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "As imagens SVG estÃ£o desativadas.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript estÃ¡ desativada por predefiniÃ§Ã£o em todos os sites nÃ£o HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript pode ser ativada numa base de por cada site atravÃ©s do botÃ£o da barra de ferramentas NoScript.">
-<!ENTITY torbutton.prefs.sec_high "Alto">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript estÃ¡ desativada por predefiniÃ§Ã£o em todos os sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipos de letra e Ãcones poderÃ£o ser visualizados incorretamente.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Os ficheiros dos tipos de letra fornecidos pelo site da Web estÃ£o bloqueados.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor para este site">
diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index 4cc12cbc3..4c37179cb 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Manter esta opÃ§Ã£o ativa para ocultar de websites as suas informaÃ§Ãµes que podem ser individuais: performance do computador, modelo de teclado, local, a localizaÃ§Ã£o e a lista dos plugins instalados, o status da sua conexÃ£o, a orientaÃ§Ã£o de tela, o tamanho da tela, os nÃveis de zoom de certos sites, os tipos de arquivos que possuem suporte, o sistema de cores, e os recursos WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "NÃvel de SeguranÃ§a">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que vocÃª desabilite certas funcionalidades de navegaÃ§Ã£o que podem tornÃ¡-la mais vulnerÃ¡vel a tentativas de ataque.">
-<!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. ">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "O mecanismo de renderizaÃ§Ã£o de fonte SVG OpenType estÃ¡ desabilitado.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Neste nÃvel de seguranÃ§a, as seguintes mudanÃ§as se aplicam (passe o mouse para mais detalhes):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video e mÃdia de audio torna-se clique-para-tocar atravÃ©s do NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sites, talvez vocÃª precise usar o botÃ£o da barra de ferramentas NoScript para habilitar esses objetos de mÃdia.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Algumas otimizaÃ§Ãµes de perfomance JavaScript estÃ£o desabilitadas.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "MÃ©dia ">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "As otimizaÃ§Ãµes de performance serÃ£o desabilitadas nos sites em JavaScript estiver habilitado.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Alguns recursos de renderizaÃ§Ã£o de fontes estÃ£o desabilitados.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "O mecanismo de renderizaÃ§Ã£o de fonte Graphite estÃ¡ desabilitado.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipos de imagem foram desabilitadas.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imagens SVG foram desabilitadas.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "O JavaScript Ã© desabilitado por padrÃ£o em todos os sites nÃ£o-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado individualmente em cada site, clicando no botÃ£o da barra de ferramentas NoScript.">
-<!ENTITY torbutton.prefs.sec_high "Alto">
-<!ENTITY torbutton.prefs.sec_all_js_desc "Por padrÃ£o, o JavaScript Ã© desabilitado em todos os sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Algumas fontes e Ãcones podem ser exibidos incorretamente.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Arquivos de fontes fornecidos pelo sÃtio web estÃ£o bloqueados.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor para este site">
diff --git a/ro/torbutton.dtd b/ro/torbutton.dtd
index a17213f5d..c6a3de947 100644
--- a/ro/torbutton.dtd
+++ b/ro/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "OpÈ?iunea Security Slider Ã®È?i permite sÄ? dezactivezi anumite caracteristici ale browser-ului care Ã®È?i fac browser-ul mai vulnerabil Ã®n faÈ?a unor tentative de hacking.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Mecanismul de expunere fonturi SVG OpenType este dezactivat.">
-<!ENTITY torbutton.prefs.sec_gen_desc "La nivel de securitate, sunt aplicate urmÄ?toarele schimbÄ?ri (cursor peste informaÈ?ie pentru detalii):">
-<!ENTITY torbutton.prefs.sec_html5_desc "Prin NoScript, media audio È?i video HTML5 devine click-to-play.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Pe anumite pagini, este posibil sÄ? fie necesar sÄ? foloseÈ?ti butonul NoScript  din bara de instrumente pentru a activa aceste obiecte media.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Unele optimizÄ?ri de performaÈ?Ä? JavaScript sunt dezactivate.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Mediu">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Sunt dezactivate optimizÄ?ri de performanÈ?Ä? pe pagini unde JavaScript este activat.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Anumite caracteristici de expunere fonturi sunt dezactivate.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Mecanismul de expunere fonturi Graphite este dezactivat.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Unele tipuri de imagini sunt dezactivate.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imaginile SVG sunt dezactivate">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript este dezactivat implicit pe toate site-urile ne-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript poate fi activat Ã®n regim per-site prin butonul NoScript din bara de instrumente. ">
-<!ENTITY torbutton.prefs.sec_high "Ã?nalt">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript este dezactivat implicit pe toate site-urile.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Unele fonturi È?i pictograme pot fi afiÈ?ate incorect.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "FiÈ?ierele font oferite de site sunt blocate.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Circuit Tor pentru acest site">
diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd
index fb05620e1..3c0b9a68b 100644
--- a/ru/torbutton.dtd
+++ b/ru/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ð?Ñ?Ñ?Ð°Ð²Ñ?Ñ?Ðµ Ñ?Ð»Ð°Ð¶Ð¾Ðº Ð½Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ð² Ñ?Ñ?Ð¾Ð¹ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð¾Ñ?Ð¼ÐµÑ?ÐµÐ½Ð½Ñ?Ð¼, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð¾Ñ? Ð²ÐµÐ±-Ñ?Ð·Ð»Ð¾Ð² Ð²ÐµÑ?Ð¸ , ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ð±Ñ?Ñ?Ñ? Ñ?Ð½Ð¸ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¼Ð¸ Ð´Ð»Ñ? Ð²Ð°Ñ?, Ð²ÐºÐ»Ñ?Ñ?Ð°Ñ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ñ?Ñ?Ñ? ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ?Ð°, Ñ?Ð°Ñ?ÐºÐ»Ð°Ð´ÐºÑ? ÐºÐ»Ð°Ð²Ð¸Ð°Ñ?Ñ?Ñ?Ñ?, Ñ?Ð·Ñ?Ðº, Ñ?Ð°Ñ?Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¸ Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ?Ñ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð², Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Ñ?ÐµÑ?Ð¸, Ð¾Ñ?Ð¸ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ? Ð¸ Ñ?Ð°Ð·Ð¼ÐµÑ? Ñ?ÐºÑ?Ð°Ð½Ð° , Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ? Ð¼Ð°Ñ?Ñ?Ñ?Ð°Ð±Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð´Ð»Ñ? ÐºÐ¾Ð½ÐºÑ?ÐµÑ?Ð½Ñ?Ñ? Ñ?Ð·Ð»Ð¾Ð², Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ?Ðµ Ñ?Ð¸Ð¿Ñ? Ñ?Ð°Ð¹Ð»Ð¾Ð², Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð½Ñ?Ðµ Ñ?Ð²ÐµÑ?Ð° Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ð¸ WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Ð£Ñ?Ð¾Ð²ÐµÐ½Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Ð?Ð¾Ð»Ð·Ñ?Ð½Ð¾Ðº Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?ÐµÑ? Ð²Ð°Ð¼ Ð·Ð°Ð¿Ñ?ÐµÑ?Ð¸Ñ?Ñ? Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¾Ñ?Ð¾Ð±ÐµÐ½Ð½Ð¾Ñ?Ñ?Ð¸ Ð¾Ð±Ð¾Ð·Ñ?ÐµÐ²Ð°Ñ?ÐµÐ»Ñ?, ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð´ÐµÐ»Ð°Ñ?Ñ? Ð²Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð±Ð¾Ð»ÐµÐµ Ñ?Ñ?Ð·Ð²Ð¸Ð¼Ñ?Ð¼ Ðº Ð¿Ð¾Ð¿Ñ?Ñ?ÐºÐ°Ð¼ Ð²Ð·Ð»Ð¾Ð¼Ð°.">
-<!ENTITY torbutton.prefs.sec_low "Ð?Ð¸Ð·ÐºÐ¸Ð¹ (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "Ð?Ð°Ð¸Ð±Ð¾Ð»ÐµÐµ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ?.">
-<!ENTITY torbutton.prefs.sec_low_desc "Ð?Ð° Ñ?Ñ?Ð¾Ð¼ Ñ?Ñ?Ð¾Ð²Ð½Ðµ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸, Ð²Ñ?Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Ð?ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼ Ð²Ð¸Ð·Ñ?Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ñ?Ñ?Ð¸Ñ?Ñ?Ð° SVG OpenType Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ð?Ð° Ñ?Ñ?Ð¾Ð¼ Ñ?Ñ?Ð¾Ð²Ð½Ðµ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸, Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?Ð¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð¿Ñ?Ð¸Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ñ?Ñ? (Ð¿Ñ?Ð¸ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ð¸ ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð° Ð¼Ñ?Ñ?Ð¸):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 Ð²Ð¸Ð´ÐµÐ¾ Ð¸ Ð°Ñ?Ð´Ð¸Ð¾ Ð²Ð¾Ñ?Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ñ?Ñ?Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¿Ð¾Ñ?Ð»Ðµ Ñ?ÐµÐ»Ñ?ÐºÐ° Ð±Ð»Ð°Ð³Ð¾Ð´Ð°Ñ?Ñ? NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Ð?Ð° Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð°Ñ?, Ð²Ð°Ð¼ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¾Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? ÐºÐ½Ð¾Ð¿ÐºÑ? NoScript Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð¾Ð², Ñ?Ñ?Ð¾Ð±Ñ? Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ñ?Ð¸ Ð¼Ñ?Ð»Ñ?Ñ?Ð¸Ð¼ÐµÐ´Ð¸Ð¹Ð½Ñ?Ðµ Ð¾Ð±Ñ?ÐµÐºÑ?Ñ?.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¼Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ JavaScript Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Ð?Ð°Ð·Ð¾Ð²Ñ?Ð¹ JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Ð¡Ñ?ÐµÐ½Ð°Ñ?Ð¸Ð¸ Ð½Ð° Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð°Ñ? Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð¼ÐµÐ´Ð»ÐµÐ½Ð½ÐµÐµ.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¼Ð°Ñ?ÐµÐ¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ñ? Ñ?Ñ?Ð°Ð²Ð½ÐµÐ½Ð¸Ð¹ Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½.">
-<!ENTITY torbutton.prefs.sec_medium "Ð¡Ñ?ÐµÐ´Ð½Ð¸Ð¹">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Ð?Ð° Ñ?Ð°Ð¹Ñ?Ð°Ñ? Ñ? Ð¿Ñ?Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼ JavaScript  Ð¾Ð¿Ñ?Ð¸Ð¼Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð°.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð¾Ñ?Ñ?Ð¸Ñ?Ð¾Ð²ÐºÐ¸ Ñ?Ñ?Ð¸Ñ?Ñ?Ð¾Ð² Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Ð?ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼ Ð²Ð¸Ð·Ñ?Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ñ?Ñ?Ð¸Ñ?Ñ?Ð° Graphite Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ð¸Ð¿Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ð¹ Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ð½Ð° Ð²Ñ?ÐµÑ? Ð½Ðµ HTTPS Ñ?Ð°Ð¹Ñ?Ð°Ñ?.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½ Ð½Ð° Ñ?Ð°Ð¹Ñ?Ðµ Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ?Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ¸ NoScript Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð¾Ð².">
-<!ENTITY torbutton.prefs.sec_high "Ð?Ñ?Ñ?Ð¾ÐºÐ¸Ð¹">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ð½Ð° Ð²Ñ?ÐµÑ? Ñ?Ð°Ð¹Ñ?Ð°Ñ?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ñ?Ñ? Ð¸ Ð·Ð½Ð°Ñ?ÐºÐ¸ Ð¼Ð¾Ð³Ñ?Ñ? Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ?Ñ?Ñ?Ñ? Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ð¤Ð°Ð¹Ð»Ñ? Ñ?Ñ?Ð¸Ñ?Ñ?Ð¾Ð², Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ Ñ?Ð°Ð¹Ñ?Ð¾Ð¼, Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ñ?">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Ð¦ÐµÐ¿Ð¾Ñ?ÐºÐ° Tor Ð´Ð»Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ð°Ð¹Ñ?Ð°">
diff --git a/ru@petr1708/torbutton.dtd b/ru@petr1708/torbutton.dtd
index e106e6cd8..1aed91d4c 100644
--- a/ru@petr1708/torbutton.dtd
+++ b/ru@petr1708/torbutton.dtd
@@ -42,29 +42,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/scn/torbutton.dtd b/scn/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/scn/torbutton.dtd
+++ b/scn/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/sco/torbutton.dtd b/sco/torbutton.dtd
index 57c3aba72..25637a466 100644
--- a/sco/torbutton.dtd
+++ b/sco/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/si_LK/torbutton.dtd b/si_LK/torbutton.dtd
index 50959c470..c21fced7f 100644
--- a/si_LK/torbutton.dtd
+++ b/si_LK/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/sk/torbutton.dtd b/sk/torbutton.dtd
index c4bdc0e80..e26eba19d 100644
--- a/sk/torbutton.dtd
+++ b/sk/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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Ä?enia">
 <!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Ãzka (predvolenÃ©)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "NastavenÃ© je podÄ¾a najpouÅ¾ivateÄ¾nejÅ¡Ãch skÃºsenosti.">
-<!ENTITY torbutton.prefs.sec_low_desc "Na tejto Ãºrovni zabezpeÄ?enia, vÅ¡etky funkcie prehliadaÄ?a sÃº povolenÃ©.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Spracovanie vykresÄ¾ovania pÃsma SVG OpenType je zakÃ¡zanÃ¡.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Na tejto Ãºrovni zabezpeÄ?enia, platia nasledujÃºce zmeny (vyÄ?lenÃ kurzor myÅ¡i):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video a audio mÃ©diÃ¡ zaÄ?nÃº hraÅ¥ kliknutÃm v NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Na niektorÃ½ch strÃ¡nkach, moÅ¾no budete musieÅ¥ pouÅ¾iÅ¥ tlaÄ?idlo NoScript pre aktivÃ¡ciu objektov mÃ©diÃ.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "NiektorÃ© vÃ½kony optimalizÃ¡cie JavaScriptu sÃº zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "ZÃ¡kladnÃ© linky JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skripty na niektorÃ½ch strÃ¡nkach mÃ´Å¾u pracovaÅ¥ pomalÅ¡ie.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "NiektorÃ© zobrazovania matematickÃ½ch rovnÃc sÃº zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML je zakÃ¡zanÃ½.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "VÅ¡etky vÃ½kony optimalizÃ¡cie JavaScriptu sÃº zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "NiektorÃ© funkcie vykresÄ¾ovania pÃsma sÃº zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "GrafickÃ© vykresÄ¾ovanie textu je zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_svg_desc "NiektorÃ© typy obrÃ¡zkov sÃº zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG obrÃ¡zky sÃº zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript je v predvolenom nastavenÃ zakÃ¡zanÃ½ na vÅ¡etkÃ½ch nie-HTTPS strÃ¡nkach.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript je moÅ¾nÃ© povoliÅ¥ na jednotlivÃ½ch strÃ¡nkach cez tlaÄ?idlo na paneli nÃ¡strojov NoScript.">
-<!ENTITY torbutton.prefs.sec_high "VysokÃ¡">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je v predvolenom nastavenÃ zakÃ¡zanÃ½ na vÅ¡etkÃ½ch strÃ¡nkach.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "NiektorÃ© pÃsma a ikony sa mÃ´Å¾u zobrazovaÅ¥ nesprÃ¡vne.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "PÃsma poskytnutÃ© web strÃ¡nkou boli zablokovanÃ©.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "StrÃ¡nka je otvorenÃ¡ cez okruh">
diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index 69859b289..af644154e 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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Ä?enia">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "MÃ´Å¾ete vypnÃºÅ¥ niektorÃ© funkcie prehliadaÄ?a, ktorÃ© ho robia zraniteÄ¾nÃ½m voÄ?i Ãºtokom.">
-<!ENTITY torbutton.prefs.sec_low "NÃzka (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Ã©.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "RenderovacÃ mechanizmus pÃsma SVG OpenType je vypnutÃ½.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Na tejto bezpeÄ?nostnej hladine sÃº pouÅ¾itÃ© tieto zmeny ( ÃºkaÅ¾te kurzorom na element pre viac informÃ¡ciÃ):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML 5 video a zvukovÃ½ zÃ¡znam sa pri kliknutÃ spustenÃ cez No Script.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Na niektorÃ½ch strÃ¡nkach bude musieÅ¥ pouÅ¾iÅ¥ talÄ?Ãtko NoScript na panely nÃ¡strojov pre povolenie tohto typu mÃ©diÃ.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "NiektorÃ© optimalizÃ¡cie vÃ½konu JavaScriptu sÃº zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "StrednÃ¡">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "Na strÃ¡nkach s povolenÃ½m JavaScriptom je vÃ½kon a optimalizÃ¡cia deaktivovanÃ¡.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "NiektorÃ© vlastnosti renderovania pÃsma sÃº vypnutÃ©.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "GrafitovÃ½ mechanizmus renderovania pÃsma je vypnutÃ½.">
-<!ENTITY torbutton.prefs.sec_svg_desc "NiektorÃ© typy obrÃ¡zkov su zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG obrÃ¡zky sÃº zakÃ¡zanÃ©.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript je v zÃ¡kladnom nastavenÃ zakÃ¡zanÃ½ na vÅ¡etkÃ½ch neÅ¡ifrovanÃ½ch strÃ¡nkach.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript mÃ´Å¾e byÅ¥ zapnutÃ© na jednotlivÃ½ch strÃ¡nkach pomocou tlaÄ?Ãtka NoScript na paneli nÃ¡strojov.">
-<!ENTITY torbutton.prefs.sec_high "VysokÃ¡">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript je v zÃ¡kladnom nastavenÃ zakÃ¡zanÃ½ na vÅ¡etkÃ½ch strÃ¡nkach.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "NiektorÃ© pÃsma a ikony sa mÃ´Å¾u zobrazovaÅ¥ nesprÃ¡vne.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "PÃsma poskytnutÃ© webovovou strÃ¡nkou boli zablokovanÃ©.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor obvod pre tÃºto strÃ¡nku">
diff --git a/sl/torbutton.dtd b/sl/torbutton.dtd
index 426b7c7bd..d3d533427 100644
--- a/sl/torbutton.dtd
+++ b/sl/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/sl_SI/torbutton.dtd b/sl_SI/torbutton.dtd
index 8fb0d5955..789adb7c8 100644
--- a/sl_SI/torbutton.dtd
+++ b/sl_SI/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType mehanizem upodabljanja font-a je onemogoÄ?eno.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Na tem varnostnem nivoju, se naslednje spremembe uveljavijo(pojdite Ä?ez besedilo z miÅ¡ko za veÄ? informacij):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video in avdio mediji postanejo kliknite-za-igranje z NoScript-om.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Na nekaterih straneh, boste mogoÄ?e morali uporabiti NoScript gumb orodne vrstice za omogoÄ?anje teh medijev.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Nekaj JavaScript optimizacij delovanja je onemogoÄ?eno.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Visok">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/sn/torbutton.dtd b/sn/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/sn/torbutton.dtd
+++ b/sn/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/so/torbutton.dtd b/so/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/so/torbutton.dtd
+++ b/so/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/son/torbutton.dtd b/son/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/son/torbutton.dtd
+++ b/son/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd
index ba00f51d9..62ee3df6f 100644
--- a/sq/torbutton.dtd
+++ b/sq/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Mekanizmi i PÃ«araqitjes sÃ« germÃ«s SVG OpenType Ã«shtÃ« paaftÃ«suar.">
-<!ENTITY torbutton.prefs.sec_gen_desc "NÃ« kÃ«tÃ« nivel sigurie, do tÃ« zbatohen ndryshimet nÃ« vijim (kalojeni miun sipÃ«r pÃ«r hollÃ«sitÃ«):">
-<!ENTITY torbutton.prefs.sec_html5_desc "Mediet pÃ«r video dhe audio HTML5 bÃ«hen kliko-pÃ«r-tÃ«-luajtur pÃ«rmes NoScript-it.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "NÃ« disa webfaqe, mund t'ju duhet tÃ« pÃ«rdorni butonin e shiritit tÃ« mjeteve tÃ« NoScript-it, qÃ« t'i aftÃ«soni kÃ«to objekte tÃ« medies.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Disa pÃ«rmirÃ«sime tÃ« paraqitjes tÃ« JavaScript  janÃ« paaftÃ«suar">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_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_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Tiparet e shfaqjes sÃ« disa germave janÃ« paaftÃ«suar.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Mekanizmi i shfaqjes sÃ« germÃ«s Graphite Ã«shtÃ« paaftÃ«suar.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Disa lloje imazhesh janÃ« paaftÃ«suar.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imazhet SVG janÃ« paaftÃ«suar.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript Ã«shtÃ« paaftÃ«suar me parazgjedhje tek tÃ« gjitha webfaqet jo-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript-i mund tÃ« aftÃ«sohet nÃ« varÃ«si tÃ« webfaqes, pÃ«rmes njÃ« butoni nÃ« shiritin e mjeteve tÃ« NoScript-it.">
-<!ENTITY torbutton.prefs.sec_high "E lartÃ«">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript-i Ã«shtÃ« i paaftÃ«suar me parazgjedhje, nÃ« tÃ« gjitha webfaqet.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Disa germa dhe ikona mund tÃ« shfaqen jo saktÃ«.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "SkedarÃ«t e germave tÃ« ofruara nga webfaqja janÃ« penguar.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Cirkuiti i Tor-it pÃ«r kÃ«tÃ« webfaqe">
diff --git a/sr/torbutton.dtd b/sr/torbutton.dtd
index cff941afd..89e9135ef 100644
--- a/sr/torbutton.dtd
+++ b/sr/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Ð?Ð¸Ñ?Ð¾Ðº">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Ð¢Ð¾Ñ? Ñ?Ð¿Ð¾Ñ? Ð·Ð° Ð¾Ð²Ð°Ñ? Ñ?Ð°Ñ?Ñ?">
diff --git a/sr@latin/torbutton.dtd b/sr@latin/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/sr@latin/torbutton.dtd
+++ b/sr@latin/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/st/torbutton.dtd b/st/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/st/torbutton.dtd
+++ b/st/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/su/torbutton.dtd b/su/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/su/torbutton.dtd
+++ b/su/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index 8f590c2c6..79368236a 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "LÃ¥t den hÃ¤r kryssrutan vara ikryssad fÃ¶r att dÃ¶lja saker frÃ¥n webbplatser som kan vara unika fÃ¶r just dig, sÃ¥som datorprestanda, tangentbordslayout, sprÃ¥kinstÃ¤llningar, plats fÃ¶r installerade plugin, lista Ã¶ver installerade plugin, nÃ¤tverksstatus, skÃ¤rmorientering, skÃ¤rmstorlek, platsspecifika zoomnivÃ¥er, filtypsstÃ¶d, systemfÃ¤rger, och WebGL-stÃ¶d.">
 <!ENTITY torbutton.prefs.sec_caption "SÃ¤kerhetsnivÃ¥">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "SÃ¤kerhetsreglaget lÃ¥ter dig stÃ¤nga av vissa webblÃ¤sarfunktioner som kan gÃ¶ra din webblÃ¤sare mer sÃ¥rbar mot intrÃ¥ngsfÃ¶rsÃ¶k.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "AnvÃ¤ndande av SVG OpenType-typsnitt Ã¤r avaktiverad.">
-<!ENTITY torbutton.prefs.sec_gen_desc "PÃ¥ den hÃ¤r sÃ¤kerhetsnivÃ¥n gÃ¤ller fÃ¶ljande fÃ¶rÃ¤ndringar (hÃ¥ll markÃ¶ren Ã¶ver fÃ¶r detaljer):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ljud- och bildmedia blir click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "PÃ¥ vissa webbplatser kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen i verktygsfÃ¤ltet.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Vissa prestandaoptimeringar av JavaScript Ã¤r inaktiverade.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript pÃ¥ vissa webbplatser kan gÃ¥ lÃ¥ngsammare.">
-<!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_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "PÃ¥ sidor dÃ¤r JavaScript Ã¤r aktiverat, Ã¤r prestandaoptimeringar inaktiverade.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Vissa funktioner fÃ¶r gestaltning av typsnitt Ã¤r avaktiverad.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "AnvÃ¤ndande av Graphite-typsnitt Ã¤r avaktiverad.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Vissa typer av bilder Ã¤r inaktiverade.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder Ã¤r inaktiverade.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript Ã¤r normalt avaktiverat pÃ¥ alla webbplatser som inte anvÃ¤nder HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras fÃ¶r enskilda webbplatser via NoScript-knappen i verktygsfÃ¤ltet.">
-<!ENTITY torbutton.prefs.sec_high "HÃ¶g">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript Ã¤r normalt avaktiverat pÃ¥ alla webbplatser.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahÃ¥lls av webbplatser Ã¤r blockerade.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor-krets fÃ¶r den hÃ¤r webbplatsen">
diff --git a/sw/torbutton.dtd b/sw/torbutton.dtd
index d1ec4e99a..e03a31ada 100644
--- a/sw/torbutton.dtd
+++ b/sw/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Katika kiwango hiki cha usalama, mabadilko haya yanafanyika (amba juu na kipanya kwa maelezo)">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/szl/torbutton.dtd b/szl/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/szl/torbutton.dtd
+++ b/szl/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ta/torbutton.dtd b/ta/torbutton.dtd
index ba9b47bd5..38378eae4 100644
--- a/ta/torbutton.dtd
+++ b/ta/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "à®?à®¯à®°à¯?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/te/torbutton.dtd b/te/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/te/torbutton.dtd
+++ b/te/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/te_IN/torbutton.dtd b/te_IN/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/te_IN/torbutton.dtd
+++ b/te_IN/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/tg/torbutton.dtd b/tg/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/tg/torbutton.dtd
+++ b/tg/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/th/torbutton.dtd b/th/torbutton.dtd
index 0b601c381..d5673b26d 100644
--- a/th/torbutton.dtd
+++ b/th/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML à¸?à¸¹à¸?à¸£à¸°à¸?à¸±à¸?à¸?à¸²à¸£à¹?à¸?à¹?à¸?à¸²à¸?.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "à¸£à¸¹à¸?à¸ à¸²à¸?à¸?à¸²à¸?à¸?à¸£à¸°à¹?à¸ à¸?à¸?à¸¹à¸?à¸£à¸°à¸?à¸±à¸?.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "à¸ªà¸¹à¸?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript à¸?à¸¹à¸?à¸£à¸°à¸?à¸±à¸?à¹?à¸?à¸¢à¸?à¸£à¸´à¸¢à¸²à¸¢à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¸¸à¸?à¹?à¸?à¸?à¹?">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "à¸§à¸?à¸?à¸£ Tor à¸ªà¸³à¸«à¸£à¸±à¸?à¹?à¸?à¸?à¹?à¸?à¸µà¹?">
diff --git a/ti/torbutton.dtd b/ti/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ti/torbutton.dtd
+++ b/ti/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/tk/torbutton.dtd b/tk/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/tk/torbutton.dtd
+++ b/tk/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index 7d1fc7e55..ebcaa67e4 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "BilgisayarÄ±nÄ±zÄ±n baÅ?arÄ±mÄ±, tuÅ? takÄ±mÄ± dÃ¼zeni, yerel dil ayarlarÄ±, yÃ¼klenmiÅ? eklentilerin konumu, yÃ¼klenmiÅ? eklentilerin listesi, aÄ?Ä±nÄ±zÄ±n durumu, ekran yÃ¶nlendirmesi, ekran boyutu, siteye baÄ?lÄ± Ã¶zel yakÄ±nlaÅ?tÄ±rma seviyeleri, desteklenen dosya tÃ¼rleri, sistem renkleri ve WebGL yetenekleri gibi size Ã¶zel olan ve kimliÄ?inizin belirlenmesinde kullanÄ±labilecek bilgileri gizlemek iÃ§in bu kutuyu iÅ?aretlenmiÅ? olarak tutun.">
 <!ENTITY torbutton.prefs.sec_caption "GÃ¼venlik DÃ¼zeyi">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "GÃ¼venlik ayarÄ± ile belirli web tarayÄ±cÄ± Ã¶zeliklerini kapatabilirsiniz. Ancak bu durumda web tarayÄ±cÄ±nÄ±z saldÄ±rÄ±lara karÅ?Ä± daha korumasÄ±z olur.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType yazÄ± tipi gÃ¶rÃ¼ntÃ¼leme dÃ¼zeneÄ?i devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Bu gÃ¼venlik dÃ¼zeyinde, Å?u deÄ?iÅ?iklikler uygulanÄ±r (ayrÄ±ntÄ±lar iÃ§in fare ile Ã¼zerlerinde dolaÅ?Ä±n):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 gÃ¶rÃ¼ntÃ¼ ve ses ortamÄ± NoScript aracÄ±lÄ±Ä?Ä±yla tÄ±klayÄ±p oynat Å?ekline dÃ¶nÃ¼Å?tÃ¼rÃ¼lÃ¼r.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "BazÄ± sitelerde bu ortam nesnelerini etkinleÅ?tirebilmek iÃ§in NoScript dÃ¼Ä?mesinin kullanÄ±lmasÄ± gerekebilir.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "BazÄ± JavaScript baÅ?arÄ±m iyileÅ?tirmeleri devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, DoÄ?al KurallÄ± Ä°fade">
-<!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_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_medium "Orta">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScript kullanÄ±lan web sitelerinde baÅ?arÄ±m iyileÅ?tirmeleri devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "BazÄ± yazÄ± tipi iÅ?leme Ã¶zellikleri devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazÄ± tipi gÃ¶rÃ¼ntÃ¼leme dÃ¼zeneÄ?i devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_svg_desc "BazÄ± gÃ¶rsel tÃ¼rleri devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG gÃ¶rselleri devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS kullanÄ±lmayan sitelerde JavaScript varsayÄ±lan olarak devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript, NoScript araÃ§ Ã§ubuÄ?u dÃ¼Ä?mesi kullanÄ±larak her site iÃ§in ayrÄ± ayrÄ± etkinleÅ?tirilebilir.">
-<!ENTITY torbutton.prefs.sec_high "YÃ¼ksek">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript varsayÄ±lan olarak tÃ¼m sitelerde devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "BazÄ± yazÄ± tipi ve simgeler dÃ¼zgÃ¼n gÃ¶rÃ¼ntÃ¼lenemeyebilir.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web sitesi tarafÄ±ndan sunulan yazÄ± tipi dosyalarÄ± engellenir.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Bu site iÃ§in Tor devresi">
diff --git a/tzm/torbutton.dtd b/tzm/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/tzm/torbutton.dtd
+++ b/tzm/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ug@Arab/torbutton.dtd b/ug@Arab/torbutton.dtd
index a4ad44d10..c1fb2667e 100644
--- a/ug@Arab/torbutton.dtd
+++ b/ug@Arab/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "Ø¹Ø§Ù?Ù?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Ø¨Ø¹Ø¶ Ø§Ù?Ø®Ø·Ù?Ø· Ù?Ø§Ù?Ø£Ù?Ù?Ù?Ù?Ø§Øª Ù?Ø¯ ØªØ¸Ù?Ø± Ø¨Ø´Ù?Ù? ØºÙ?Ø± ØµØÙ?Ø">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/uk/torbutton.dtd b/uk/torbutton.dtd
index a988bd400..449ca437e 100644
--- a/uk/torbutton.dtd
+++ b/uk/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "Ð?Ð° Ñ?Ñ?Ð¾Ð¼Ñ? Ñ?Ñ?Ð²Ð½Ñ? Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, Ð²Ñ?Ñ? Ñ?Ñ?Ð½ÐºÑ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip " SVG OpenType  Ð¼ÐµÑ?Ð°Ð½Ñ?Ð·Ð¼ Ñ?ÐµÐ½Ð´ÐµÑ?Ð¸Ð½Ð³Ð° Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ð² Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¹.">
-<!ENTITY torbutton.prefs.sec_gen_desc "Ð?Ð° Ñ?Ñ?Ð¾Ð¼Ñ? Ñ?Ñ?Ð²Ð½Ñ? Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, Ñ?Ð°ÐºÑ? Ð·Ð¼Ñ?Ð½Ð¸ Ð·Ð°Ñ?Ñ?Ð¾Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? (Ð½Ð°Ð²ÐµÑ?Ñ?Ð¸ ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð¾Ð¼ Ð´Ð»Ñ? Ð´ÐµÑ?Ð°Ð»ÐµÐ¹):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 Ð²Ñ?Ð´ÐµÐ¾ Ñ? Ð°Ñ?Ð´Ñ?Ð¾ Ñ?Ñ?Ð°Ð»Ð¾ click-to-play Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ? NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Ð?Ð° Ð´ÐµÑ?ÐºÐ¸Ñ? Ñ?Ð°Ð¹Ñ?Ð°Ñ?, Ð²Ð°Ð¼, Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð±Ñ?Ð´Ðµ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ð¾ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸ ÐºÐ½Ð¾Ð¿ÐºÑ? NoScript Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ñ? Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ñ?Ð², Ð´Ð»Ñ? Ñ?Ð¾Ð³Ð¾, Ñ?Ð¾Ð± Ñ?Ð²Ñ?Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Ð¼Ñ?Ð»Ñ?Ñ?Ð¸Ð¼ÐµÐ´Ñ?Ð°.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Ð?ÐµÑ?ÐºÑ? Ð¾Ð¿Ñ?Ð¸Ð¼Ñ?Ð·Ð°Ñ?Ñ?Ñ? JavaScript Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Ð?Ð°Ð·Ð¾Ð²Ð¸Ð¹ JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Ð¡ÐºÑ?Ð¸Ð¿Ñ?Ð¸ Ð½Ð° Ð´ÐµÑ?ÐºÐ¸Ñ? Ñ?Ð°Ð¹Ñ?Ð°Ñ? Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð»Ñ?Ð½Ñ?Ñ?Ðµ.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "Ð?ÐµÑ?ÐºÑ? Ð¼ÐµÑ?Ð°Ð½Ñ?Ð·Ð¼Ð¸ Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð¼Ð°Ñ?ÐµÐ¼Ð°Ñ?Ð¸Ñ?Ð½Ð¸Ñ? Ñ?Ñ?Ð²Ð½Ñ?Ð½Ñ? Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¹.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Ð?ÐµÑ?ÐºÑ? Ð¾Ñ?Ð¾Ð±Ð»Ð¸Ð²Ð¾Ñ?Ñ?Ñ? Ñ?ÐµÐ½Ð´ÐµÑ?Ð¸Ð½Ð³Ñ? Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ð² Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Ð?ÐµÑ?Ð°Ð½Ñ?Ð·Ð¼ Ñ?ÐµÐ½Ð´ÐµÑ?Ð¸Ð½Ð³Ð° Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ð² Graphite Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð°.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Ð?ÐµÑ?ÐºÑ? Ñ?Ð¸Ð¿Ð¸ Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ñ? Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð²Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?Ð¼ Ð½Ð° Ñ?Ñ?Ñ?Ñ? Ð½Ðµ HTTPS Ñ?Ð°Ð¹Ñ?Ð°Ñ?.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript Ð¼Ð¾Ð¶Ðµ Ð±Ñ?Ñ?Ð¸ Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¹ Ð½Ð° Ð¿ÐµÐ²Ð½Ð¾Ð¼Ñ? Ñ?Ð°Ð¹Ñ?Ñ? Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ñ? Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ñ?Ð² NoScript.">
-<!ENTITY torbutton.prefs.sec_high "Ð?Ð¸Ñ?Ð¾ÐºÐ¸Ð¹">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?Ð¼ Ð½Ð° Ð²Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð°Ñ?.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Ð?ÐµÑ?ÐºÑ? Ñ?Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð° Ñ?ÐºÐ¾Ð½ÐºÐ¸ Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ?Ð¸Ñ?Ñ? Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ð¾.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ð¤Ð°Ð¹Ð»Ð¸ Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ð², Ð½Ð°Ð´Ð°Ð½Ñ? Ñ?Ð°Ð¹Ñ?Ð¾Ð¼, Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ñ?">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Ð¡Ñ?ÐµÐ¼Ð° Tor Ð´Ð»Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ð°Ð¹Ñ?Ñ?">
diff --git a/ur/torbutton.dtd b/ur/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ur/torbutton.dtd
+++ b/ur/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ur_PK/torbutton.dtd b/ur_PK/torbutton.dtd
index 41d907ec9..406e58a61 100644
--- a/ur_PK/torbutton.dtd
+++ b/ur_PK/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/uz/torbutton.dtd b/uz/torbutton.dtd
index 7a36df630..dd1c30f94 100644
--- a/uz/torbutton.dtd
+++ b/uz/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/ve/torbutton.dtd b/ve/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/ve/torbutton.dtd
+++ b/ve/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/vi/torbutton.dtd b/vi/torbutton.dtd
index 02fe8be9a..b5606a0fd 100644
--- a/vi/torbutton.dtd
+++ b/vi/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "LuÃ´n Ä?Ã¡nh dáº¥u há»?p nÃ y Ä?á»? áº©n cÃ¡c dáº¥u hiá»?u cÃ³ thá»? lÃ  Ä?áº·c trÆ°ng duy nháº¥t vá»? báº¡n, bao gá»?m kháº£ nÄ?ng lÃ m viá»?c cá»§a mÃ¡y tÃnh cá»§a báº¡n, cÃ¡ch sáº¯p xáº¿p cá»§a bÃ n phÃm, nÆ¡i á»?, vá»? trÃ cá»§a cÃ¡c trÃ¬nh thÃªm vÃ o (plugins) Ä?Æ°á»£c cÃ i Ä?áº·t, danh sÃ¡ch cá»§a cÃ¡c trÃ¬nh thÃªm vÃ o Ä?Æ°á»£c cÃ i Ä?áº·t, tráº¡ng thÃ¡i máº¡ng cá»§a báº¡n, Ä?á»?nh hÆ°á»?ng mÃ n hÃ¬nh, kÃch thÆ°á»?c mÃ n hÃ¬nh, cÃ¡c má»©c Ä?á»? phÃ³ng to-thu nhá»? Ä?á»?i vá»?i cÃ¡c trang cá»¥ thá»?, cÃ¡c dáº¡ng tá»?p tin Ä?Æ°á»£c há»? trá»£, cÃ¡c mÃ u há»? thá»?ng, vÃ  cÃ¡c nÄ?ng lá»±c WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Má»©c Ä?á»? Báº£o máºt">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Nhá»¯ng NgÆ°á»?i Ä?iá»?u chá»?nh an ninh Ä?á»? cho báº¡n vÃ´ hiá»?u má»?t vÃ i tÃnh nÄ?ng cá»§a trÃ¬nh duyá»?t mÃ  cÃ³ thá»? lÃ m trÃ¬nh duyá»?t cá»§a báº¡n dá»? bá»? tá»?n thÆ°Æ¡ng Ä?á»?i vá»?i nhá»¯ng cá»? gáº¯ng táº¥n cÃ´ng.">
-<!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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "CÆ¡ cháº¿ káº¿t xuáº¥t font SVG OpenType bá»? vÃ´ hiá»?u.">
-<!ENTITY torbutton.prefs.sec_gen_desc "á»? má»©c báº£o máºt nÃ y, nhá»¯ng thay Ä?á»?i sau sáº½ Ä?Æ°á»£c Ã¡p dá»¥ng (rÃª chuá»?t vÃ o Ä?á»? xem chi tiáº¿t):">
-<!ENTITY torbutton.prefs.sec_html5_desc "Video vÃ  Ã¢m thanh truyá»?n thÃ´ng HTML5 cÃ³ thá»? trá»? thÃ nh nháº¥p Ä?á»? phÃ¡t qua NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "TrÃªn má»?t sá»? trang, cÃ³ thá»? báº¡n cáº§n pháº£i dÃ¹ng nÃºt thanh cÃ´ng cá»¥ NoScript Ä?á»? kÃch hoáº¡t nhá»¯ng Ä?á»?i tÆ°á»£ng Ä?a phÆ°Æ¡ng tiá»?n nÃ y.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Má»?t sá»? tá»?i Æ°u hoÃ¡ JavaScript bá»? vÃ´ hiá»?u.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Nhá»¯ng Ä?oáº¡n mÃ£ trÃªn má»?t sá»? trang cÃ³ thá»? cháº¡y cháºm hÆ¡n.">
-<!ENTITY torbutton.prefs.sec_mathml_desc "Má»?t vÃ i cÆ¡ cháº¿ hiá»?n thá»? cÃ´ng thá»©c toÃ¡n há»?c bá»? vÃ´ hiá»?u.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathMK bá»? vÃ´ hiá»?u">
-<!ENTITY torbutton.prefs.sec_medium "Vá»«a pháº£i">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "TrÃªn nhá»¯ng trang nÆ¡i JavaScript Ä?Æ°á»£c cho phÃ©p, viá»?c tá»?i Æ°u hÃ³a hiá»?u suáº¥t bá»? vÃ´ hiá»?u.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Má»?t vÃ i chá»©c nÄ?ng tÃ´ váº½ phÃ´ng chá»¯ bá»? vÃ´ hiá»?u.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "CÆ¡ cháº¿ tÃ´ váº½ phÃ´ng chá»¯ Graphite bá»? vÃ´ hiá»?u.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Má»?t vÃ i loáº¡i hÃ¬nh áº£nh bá»? vÃ´ hiá»?u.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "HÃ¬nh áº£nh SVG bá»? vÃ´ hiá»?u.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript máº·c Ä?á»?nh bá»? vÃ´ hiá»?u trÃªn táº¥t cáº£ cÃ¡c trang non-HTTPS.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript cÃ³ thá»? Ä?Æ°á»£c cho phÃ©p trÃªn ná»?n táº£ng má»?i trang thÃ´ng qua nÃºt NoScript trÃªn thanh cÃ´ng cá»¥.">
-<!ENTITY torbutton.prefs.sec_high "Cao">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript máº·c Ä?á»?nh bá»? vÃ´ hiá»?u trÃªn táº¥t cáº£ cÃ¡c trang.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Má»?t vÃ i phÃ´ng chá»¯ vÃ  biá»?u tÆ°á»£ng cÃ³ thá»? hiá»?n thá»? khÃ´ng Ä?Ãºng.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Nhá»¯ng táºp tin phÃ´ng chá»¯ do trang web cung cáº¥p bá»? cháº·n.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Ä?áº§u ná»?i Tor dÃ nh cho trang nÃ y.">
diff --git a/wa/torbutton.dtd b/wa/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/wa/torbutton.dtd
+++ b/wa/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/wo/torbutton.dtd b/wo/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/wo/torbutton.dtd
+++ b/wo/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd
index 153d1842c..236e2d46b 100644
--- a/zh_CN/torbutton.dtd
+++ b/zh_CN/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "å?¾é??æ¤é??é¡¹ä»¥é?¿å??ç½?ç«?è?·å??æ?¨ç??æµ?è§?å?¨æ??çº¹ä¿¡æ?¯ï¼?å??æ?¬æ?¨ç??è®¡ç®?æ?ºæ?§è?½ã??é?®ç??å¸?å±?ã??ç³»ç»?è¯è¨?ã??å®?è£?æ??ä»¶ç??ä½?ç½®ã??å·²å®?è£?æ??ä»¶å??è¡¨ã??æ?¨ç??ç½?ç»?ç?¶æ??ã??å±?å¹?æ?¹å??ã??å±?å¹?å°ºå¯¸ã??ç?¹å®?ç½?ç«?ç¼©æ?¾çº§å?«ã??æ?¯æ??ç??æ??ä»¶ç±»å??ã??ç³»ç»?é¢?è?²ã??WebGL å??è?½ã??">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?çº§">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "å®?å?¨æ»?å??å?¯ç¦?ç?¨æ??äº?æµ?è§?å?¨å??è?½ï¼?é?¿å??å? è¿?äº?å??è?½å¯¼è?´ç??æ¼?æ´?è??å??å?°æ?»å?»ã??">
-<!ENTITY torbutton.prefs.sec_low "ä½?ï¼?é»?è®¤ï¼?">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "è¯¥é??é¡¹å?¯æ??ä¾?æ??ä½³ç??ç?¨æ?·ä½?éª?ã??">
-<!ENTITY torbutton.prefs.sec_low_desc "è¯¥å®?å?¨çº§å?«å°?å?¯ç?¨æ??æ??æµ?è§?å?¨å??è?½ã??">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "ç¦?ç?¨ SVG OpenType å?ä½?æ¸²æ??å??è?½ã??">
-<!ENTITY torbutton.prefs.sec_gen_desc "å?¨è¿?ä¸ªå®?å?¨çº§å?«ï¼?ä¸?å??æ?´æ?¹å°?ä¼?ç??æ??ï¼?é¼ æ ?æ?¬å??æ?¥ç??ç»?è??ï¼?ï¼?">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 è§?é¢?å??é?³é¢?é??é??è¿? NoScript ç?¹å?»æ?æ?¾ã??">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "å?¨æ??äº?ç½?ç«?ï¼?å?¯é??è¿? NoScript å·¥å?·æ ?æ??é?®æ?æ?¾è¿?äº?åª?ä½?ã??">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "ç¦?ç?¨æ??äº? JavaScript æ?§è?½ä¼?å??ã??">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JITï¼?å??ç??RegExpã??">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JITã??">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "ä¸?äº?ç½?ç«?è??æ?¬å?¯è?½ä¼?ç¼?æ?§è¡?ã??">
-<!ENTITY torbutton.prefs.sec_mathml_desc "ç¦?ç?¨æ?°å¦æ?¹ç¨?å¼?ç??æ??äº?æ?¾ç¤ºæ?ºå?¶ã??">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "ç¦?ç?¨ MathMLã??">
-<!ENTITY torbutton.prefs.sec_medium "ä¸ç?">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "å?¨å¼?å?¯ JavaScript ç??ç«?ç?¹ä¸?ç¦?ç?¨æ?§è?½ä¼?å??ã??">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "ç¦?ç?¨æ??äº?å?ä½?æ¸²æ??å??è?½ã??">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "ç¦?ç?¨ Graphite å?ä½?æ¸²æ??ã??">
-<!ENTITY torbutton.prefs.sec_svg_desc "ç¦?ç?¨æ??äº?å?¾å??ç±»å??ã??">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "ç¦?ç?¨ SVG å?¾å??ã??">
-<!ENTITY torbutton.prefs.sec_js_https_desc "å¯¹äº?é?? HTTPS ç½?ç«?ï¼?é»?è®¤ç¦?ç?¨ JavaScriptã??">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "å?¯é??è¿?å·¥å?·æ ?ä¸?ç??  NoScript æ??é?®ï¼?å?¯ç?¨æ??ä¸ªç½?ç«?ä¸?ç?? JavaScriptã??">
-<!ENTITY torbutton.prefs.sec_high "é«?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "é»?è®¤ç¦?ç?¨æ??æ??ç½?ç«? JavaScriptã??">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "æ??äº?å?ä½?å??å?¾æ ?å?¯è?½æ? æ³?æ£ç¡®æ?¾ç¤ºã??">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ç¦?ç?¨ç½?ç«?æ??ä¾?ç??å?ä½?æ??ä»¶ã??">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "ä¸ºæ¤ç«?ç?¹ä½¿ç?¨ç?? Tor çº¿è·¯">
diff --git a/zh_HK/torbutton.dtd b/zh_HK/torbutton.dtd
index 29dfd4b6f..1ae6cba3c 100644
--- a/zh_HK/torbutton.dtd
+++ b/zh_HK/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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 "æ¤å®?å?¨ç?ç´?ä¸?ï¼?å°?å??ç?¨å?¨é?¨ç??è¦½å?¨å??è?½ã??">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "å·²å??ç?¨SVG OpenTypeå?å??å??å??å??è?½ã??">
-<!ENTITY torbutton.prefs.sec_gen_desc "æ¤å®?å?¨ç?ç´?ä¸?ï¼?å°?å¥?ç?¨ä»¥ä¸?æ?´æ?¹ï¼?(å°?æ»?é¼ æ¸¸æ¨?ç§»è?³ä¸?æ?¹ä»¥é¡¯ç¤ºè©³ç´°è³?è¨?)">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5å½±é?³å?ºNoScriptæ¨¡å¼?é?²è¡?ã??æ?³è?½å?»æ?æ?¾ã??ã??">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "å?ºæ??äº?ç¶²ç«?ï¼?ä½ æ??é ?æ?³NoScriptå·¥å?·å??æ??é??ä»¥å??ç?¨å½±é?³ç?©ä»¶ã??">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "å·²å??ç?¨é?¨ä»½JavaScriptæ??è?½æ??ä½³å??ã??">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "å?ºæ?¬JITã??">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "æ??äº?ç¶²ç«?å??ç¨?å¼?ç¢¼æ??å?·è¡?å¾?è¼?æ?¢ã??">
-<!ENTITY torbutton.prefs.sec_mathml_desc "å·²å??ç?¨é?¨ä»½é¡¯ç¤ºæ?¸å¸æ?¹ç¨?å¼?å??å??è?½ã??">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "å·²å??ç?¨MathMLã??">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "å·²å??ç?¨é?¨ä»½å??å?å??å??å??å??è?½ã??">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "å·²å??ç?¨Graphiteå?å??å??å??å??è?½ã??">
-<!ENTITY torbutton.prefs.sec_svg_desc "å·²å??ç?¨é?¨ä»½å??å??æ ¼å¼?ã??">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "å·²å??ç?¨SVGå??å??ã??">
-<!ENTITY torbutton.prefs.sec_js_https_desc "é ?è¨å?ºå?¨é?¨é??httpsç¶²ç«?å??ç?¨JavaScriptã??">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "å?¯å°?å??å?¥ç¶²ç«?å??ç?ªJavaScriptï¼?ä½?é ?æ?³NoScriptå·¥å?·å??æ??é??ã??">
-<!ENTITY torbutton.prefs.sec_high "é«?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "é ?è¨å?ºå?¨é?¨ç¶²ç«?å??ç?¨JavaScriptã??">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "é?¨ä»½å?å??å??å??ç¤ºå?¯è?½ç?¡æ³?æ£å¸¸é¡¯ç¤ºã??">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "å°?é??ç¶²ç«?æ??ä¾?å??å?å??ã??">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "æ¤ç¶²ç«?å??Toræ´?è?¥è·¯ç?±ç·?è·¯">
diff --git a/zh_TW/torbutton.dtd b/zh_TW/torbutton.dtd
index 60f0e675f..1ae18a5f8 100644
--- a/zh_TW/torbutton.dtd
+++ b/zh_TW/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "å?¾é?¸å??å??æ¤å??è?½å?¯ä»¥é?¿å??ä¸?é?¢é??äº?è³?è¨?è¢«æ??é? è¨ªç??ç¶²ç«?å??å¾?ï¼?é??äº?è³?è¨?é?½å?¯ä»¥è¢«ç?¨ä¾?è?å?¥æ?¨ç??ç??å¯¦èº«ä»½ï¼?é?»è?¦ç³»çµ±æ??è?½ã??é?µç?¤ä½?å±?ã??èª?ç³»è¨å®?ã??å¤?æ??å??ä»¶ç??å®?è£?ä½?ç½®ã??å·²å®?è£?ä¹?å¤?æ??å??ä»¶ã??ç¶²è·¯ç??æ??ã??è?¢å¹?ç??å¤§å°?è??è§£æ??åº¦ã??æ?¯æ?´ç??æª?æ¡?æ ¼å¼?ã??ç³»çµ±è?²å½©è¨å®?ã??WebGL ä¹?ç¹ªå??é??ç®?è?½å??ã??">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?ç´?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "æ¤å®?å?¨æ?§èª¿æ?´æ»?æ£?æ??é??é??æ??äº?ç??è¦½å?¨ç??å??è?½ï¼?å°?è?´æ?¨ç??ç??è¦½å?¨æ?´å®¹æ??é?å??é§å®¢æ?»æ??ã??">
-<!ENTITY torbutton.prefs.sec_low "ä½?(é ?è¨)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "é??æ??ä¾?äº?æ??å¯¦ç?¨ç??ä½¿ç?¨ç¶?é©?">
-<!ENTITY torbutton.prefs.sec_low_desc "å?¨æ¤å®?å?¨å±¤ç´?ä¸?ï¼?æ??æ??ç??è¦½å?¨å??è?½é?½å°?å??ç?¨">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType Font æ¸²æ??å??è?½å·²å??ç?¨">
-<!ENTITY torbutton.prefs.sec_gen_desc "å?¨æ¤å®?å?¨å±¤ç´?ä¸?ï¼?ä»¥ä¸?è®?æ?´å°?è¢«å¥?ç?¨(å°?æ¸¸æ¨?ç§»è?³ä¸?æ?¹ä»¥é¡¯ç¤ºè©³ç´°è³?è¨?)">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 å½±ç??å??é?³æ??å°?ä½¿ç?¨ NoScript ä»¥æ?¯æ?´ã??é»?æ??å¾?æ?æ?¾ã??">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "å?¨æ??äº?ç¶²ç«?ï¼?ä½ å?¯è?½é??è¦?æ??ä¸? NoScript å·¥å?·å??æ??é??ä»¥å??ç?¨åª?é«?ç?©ä»¶">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "é?¨ä»½ JavaScript æ?§è?½å?ªå??å·²å??ç?¨">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "å?ºæ?¬ JITã??">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "è?³æ?¬å?¨æ??äº?ç¶²ç«?æ??å?·è¡?ç??æ¯?è¼?æ?¢">
-<!ENTITY torbutton.prefs.sec_mathml_desc "ä¸?äº?é¡¯ç¤ºæ?¸å¸æ?¹ç¨?å¼?ç??å??è?½å·²è¢«å??ç?¨">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML å·²å??ç?¨">
-<!ENTITY torbutton.prefs.sec_medium "åª?é«?">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "å?¨æ¤ç¶²ç«?JavaScriptå·²å??ç?¨è??æ?§è?½å?ªå??å·²å??ç?¨">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "ä¸?äº?å?é«?æ¸²æ??å??è?½å·²å??ç?¨">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "ç²?é«?æ¸²æ??å??è?½å·²å??ç?¨">
-<!ENTITY torbutton.prefs.sec_svg_desc "ä¸?äº?å½±å??æ ¼å¼?å·²å??ç?¨">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG å½±å??æ ¼å¼?å·²å??ç?¨">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript é ?è¨å??ç?¨æ?¼æ??æ??é??HTTPSç¶²ç«?">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript å?¯ä½¿ç?¨ NoScriptå·¥å?·å??æ??é?? ä¾?å??ç?¨">
-<!ENTITY torbutton.prefs.sec_high "é«?">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript å·²å??ç?¨æ?¼æ??æ??ç¶²ç«?">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "æ??äº?å?é«?å??å??ç¤ºå?¯è?½ç?¡æ³?æ£å¸¸é¡¯ç¤º">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "é? ç«¯å?é«?å·²è¢«å°?é??">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "æ?¬ç¶²ç«?ç?? Tor è¿´è·¯">
diff --git a/zu/torbutton.dtd b/zu/torbutton.dtd
index 608947ce6..7ccad6a82 100644
--- a/zu/torbutton.dtd
+++ b/zu/torbutton.dtd
@@ -33,29 +33,18 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your 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.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp.">
-<!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_mathml_desc "Some mechanisms of displaying math equations are disabled.">
-<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
-<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">
-<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled.">
-<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites.">
-<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button.">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
-<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
+<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
+<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">

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

Prev by Author: [tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
Next by Author: [tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib
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