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

[tor-commits] [torbutton/master] Translations update



commit d8a65ac9c880896d990e22b7c3d54a0ba041458c
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Mon Dec 18 08:12:32 2017 +0000

    Translations update
---
 src/chrome/locale/ar/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/de/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/es/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/eu/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/fa/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/fr/aboutDialog.dtd      |  4 +--
 src/chrome/locale/fr/aboutTor.dtd         | 14 +++++-----
 src/chrome/locale/fr/aboutTor.properties  |  4 +--
 src/chrome/locale/fr/brand.properties     |  8 +++---
 src/chrome/locale/fr/torbutton.dtd        | 43 ++++++++++++-------------------
 src/chrome/locale/fr/torbutton.properties | 28 ++++++++++----------
 src/chrome/locale/it/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/ja/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/ko/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/nl/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/pl/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/pt-BR/torbutton.dtd     | 39 ++++++++++------------------
 src/chrome/locale/ru/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/sv/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/tr/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/vi/torbutton.dtd        | 39 ++++++++++------------------
 src/chrome/locale/zh-CN/torbutton.dtd     | 41 +++++++++++------------------
 22 files changed, 270 insertions(+), 457 deletions(-)

diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index db75c7a..3de2586 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 6dac97e..cf5cdc2 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index a562e00..1a0f9fd 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index cfffc79..823cf58 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index bd3eb16..5f0a627 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd
index bc47fce..a6d1ec4 100644
--- a/src/chrome/locale/fr/aboutDialog.dtd
+++ b/src/chrome/locale/fr/aboutDialog.dtd
@@ -9,11 +9,11 @@
 <!ENTITY help.or                 "ou">
 <!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
 <!ENTITY help.getInvolvedLink    "impliquez-vous">
-<!ENTITY help.end                " !">
+<!ENTITY help.end                "â??!">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
 <!ENTITY bottomLinks.questions   "Des questionsâ???">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
 <!ENTITY bottomLinks.grow        "Aidez à la croissance du réseau Torâ??!">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
 <!ENTITY bottomLinks.license  "Informations de licence">
-<!ENTITY tor.TrademarkStatement   "« Tor » et le « logo Oignon » sont des marques déposées de « The Tor Project, Inc. »">
+<!ENTITY tor.TrademarkStatement   "« Tor » et le « logo Oignon » sont des marques déposées de « The Tor Project, Inc. »">
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 8b1e3b1..a325239 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -6,16 +6,16 @@
 
 <!ENTITY aboutTor.title "Ã? propos de Tor ">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur n'est pas à jour.">
-<!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas à jour.">
-<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon, puis choisissez Vérifier les màj. du navigateur Tor.">
+<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur nâ??est pas à jour.">
+<!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur nâ??est pas à jour.">
+<!ENTITY aboutTor.outOfDate2.label "Cliquez sur lâ??oignon, puis choisissez Vérifier les màj. du navigateur Tor.">
 
 <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor">
 
 <!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor">
 <!ENTITY aboutTor.success2.label "Connecté au réseau Tor.">
 <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer sur Internet anonymement.">
-<!ENTITY aboutTor.failure.label "Une erreur s'est produiteâ??!">
+<!ENTITY aboutTor.failure.label "Une erreur sâ??est produiteâ??!">
 <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur.">
 
 <!ENTITY aboutTor.search.label "Rechercher">
@@ -26,11 +26,11 @@
 <!ENTITY aboutTor.torInfo3.label "NÅ?ud de sortie :">
 <!ENTITY aboutTor.torInfo4.label "Ce serveur ne journalise aucune information sur les visteurs.">
 <!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuiteâ???">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymementâ??! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité.">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor nâ??est PAS tout ce dont vous avez besoin pour naviguer anonymementâ??! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité.">
 <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning";>
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Le guide d'utilisation du navigateur Tor">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Le guide dâ??utilisation du navigateur Tor">
 <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aiderâ??!">
 <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :">
 <!ENTITY aboutTor.helpInfo3.label "Faire tourner un nÅ?ud relais Tor »">
@@ -40,6 +40,6 @@
 <!ENTITY aboutTor.helpInfo5.label "Faire un don »">
 <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html";>
 
-<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation sans but lucratif US 501(c)(3) dédiée à la recherche, le développement et l'éducation sur l'anonymat et la vie privée en ligne.">
+<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation sans but lucratif US 501(c)(3) dédiée à la recherche, le développement et lâ??éducation sur lâ??anonymat et la vie privée en ligne.">
 <!ENTITY aboutTor.learnMore.label "En savoir plus sur le projet Tor »">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html";>
diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties
index cd844af..f29050a 100644
--- a/src/chrome/locale/fr/aboutTor.properties
+++ b/src/chrome/locale/fr/aboutTor.properties
@@ -11,9 +11,9 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/
 aboutTor.donationBanner.donate=Faites un don maintenantâ??!
 
 aboutTor.donationBanner.slogan=Tor : la puissance de la résistance numérique
-aboutTor.donationBanner.mozilla=Faites un don aujourd'hui et Mozilla fera un don équivalentâ??!
+aboutTor.donationBanner.mozilla=Faites un don aujourdâ??hui et Mozilla fera un don équivalentâ??!
 
-aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs d'alerte et activistes depuis 2006
+aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs dâ??alerte et activistes depuis 2006
 aboutTor.donationBanner.tagline2=Vers un réseau mondial de liberté
 aboutTor.donationBanner.tagline3=La liberté en ligne
 aboutTor.donationBanner.tagline4=Pour favoriser la libre expression dans le monde entier
diff --git a/src/chrome/locale/fr/brand.properties b/src/chrome/locale/fr/brand.properties
index d6cc6b4..0c6249f 100644
--- a/src/chrome/locale/fr/brand.properties
+++ b/src/chrome/locale/fr/brand.properties
@@ -7,10 +7,10 @@ brandShortName=Navigateur Tor
 brandFullName=Navigateur Tor
 vendorShortName=Projet Tor
 
-homePageSingleStartMain=Firefox Start, une page d'accueil rapide avec recherche intégrée
-homePageImport=Importez votre page d'accueil à partir de %S
+homePageSingleStartMain=Firefox Start, une page dâ??accueil rapide avec recherche intégrée
+homePageImport=Importez votre page dâ??accueil à partir de %S
 
-homePageMigrationPageTitle=Choix de la page d'accueil
-homePageMigrationDescription=Veuillez choisir la page d'accueil que vous souhaitez utiliser :
+homePageMigrationPageTitle=Choix de la page dâ??accueil
+homePageMigrationDescription=Veuillez choisir la page dâ??accueil que vous souhaitez utiliser :
 
 syncBrandShortName=Synchro
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 978cbc1..def0ef7 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -28,34 +28,23 @@
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les fichiers témoins tiers et les autres données de suivi à la trace">
 <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "L">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace lorsque vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricônes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d'autres utilisateurs du navigateur Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue dâ??autres utilisateurs du navigateur Tor">
 <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
-<!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.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/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 945dc11..1ac1cfd 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -3,38 +3,38 @@ torbutton.circuit_display.ip_unknown = IP inconnue
 torbutton.circuit_display.onion_site = Site Oignon
 torbutton.circuit_display.this_browser = Ce navigateur
 torbutton.circuit_display.relay = relayer
-torbutton.circuit_display.tor_bridge = Pont (Bridge)
+torbutton.circuit_display.tor_bridge = Pont
 torbutton.circuit_display.unknown_country = Pays inconnu
-torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l'on vous suive à la trace en ligne.
+torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que lâ??on vous suive à la trace en ligne.
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
 torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor
 torbutton.panel.label.disabled = Tor Inactif
 torbutton.panel.label.enabled = Tor Actif
 extensions.torbutton@xxxxxxxxxxxxxx.description = BoutonTor fournit un bouton pour configurer les paramètres de Tor et vider facilement les données de navigation privée.
 torbutton.popup.external.title = Télécharger un type de fichier externeâ???
-torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de l'ouvrir avec une autre application.
-torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions à l'Internet sans passer par Tor pour certaines applications 
+torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de lâ??ouvrir avec une autre application.
+torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions à lâ??Internet sans passer par Tor pour certaines applications 
 torbutton.popup.external.suggest = Par sécurité, vous ne devriez ouvrir les fichiers téléchargés que lorsque vous êtes hors ligne, ou en utilisant un CD autonome Tor comme Tails.\n
 torbutton.popup.launch = Télécharger le fichier
 torbutton.popup.cancel = Annuler
 torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant
-torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymatâ???
-torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il n'a pas accès au port de contrôle de Tor.\n\nUtilisez-vous l'offre groupée de navigation Torâ???
+torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors sâ??afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymatâ???
+torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il nâ??a pas accès au port de contrôle de Tor.\n\nUtilisez-vous lâ??offre groupée de navigation Torâ???
 torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor
-torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n'est pas sécuritaire d'utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l'offre groupée de navigation Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même s'il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor.
-torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTorâ??!\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus d'informations.
+torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il nâ??est pas sécuritaire dâ??utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger lâ??offre groupée de navigation Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même sâ??il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor.
+torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTorâ??!\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus dâ??informations.
 
 torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à vos anonymat et vie privée.\n\nIls peuvent également contourner Tor afin de révéler votre position actuelle ainsi que votre adresse IP.\n\nÃ?tes-vous certain de vouloir activer les greffonsâ???\n\n
 torbutton.popup.never_ask_again = Ne plus me poser la question.
 torbutton.popup.confirm_newnym = Le navigateur Tor fermera tous les fenêtres et onglets. Toutes les sessions des sites Web seront perdues.\n\nRedémarrer le navigateur Tor maintenant pour réinitialiser votre identitéâ???\n\n
 
-torbutton.slider_notification = Le menu de l'oignon vert propose maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez-le !
+torbutton.slider_notification = Le menu de lâ??oignon vert propose maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez-leâ??!
 torbutton.slider_notification_button = Ouvrir préférences de sécurité
 
-torbutton.maximize_warning = Maximiser le navigateur Tor à l'écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille d'origine.
+torbutton.maximize_warning = Maximiser le navigateur Tor à lâ??écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille dâ??origine.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Ce site Web (%S) a essayé d'extraire des données d'image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web d'extraire des données d'image de canevas HTML5â???
+canvas.siteprompt=Ce site Web (%S) a essayé dâ??extraire des données dâ??image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web dâ??extraire des données dâ??image de canevas HTML5â???
 canvas.notNow=Pas maintenant
 canvas.notNowAccessKey=P
 canvas.allow=Autoriser à lâ??avenir
@@ -45,7 +45,7 @@ canvas.neverAccessKey=e
 # Profile/startup error messages. Strings are kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
 profileProblemTitle=Problème de profil %S
-profileReadOnly=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers un autre emplacement avant d'essayer de l'utiliser.
-profileReadOnlyMac=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers votre dossier Bureau ou Applications avant d'essayer de l'utiliser.
-profileAccessDenied=%S n'a pas le droit d'accéder au profil. Veuillez ajuster les droits de votre système de fichiers et ressayer.
+profileReadOnly=Vous ne pouvez pas exécuter %S à partir dâ??un système de fichiers en lecture seul. Veuillez copier %S vers un autre emplacement avant dâ??essayer de lâ??utiliser.
+profileReadOnlyMac=Vous ne pouvez pas exécuter %S à partir dâ??un système de fichiers en lecture seul. Veuillez copier %S vers votre dossier Bureau ou Applications avant dâ??essayer de lâ??utiliser.
+profileAccessDenied=%S nâ??a pas le droit dâ??accéder au profil. Veuillez ajuster les droits de votre système de fichiers et ressayer.
 profileMigrationFailed=La migration de votre profil existant %S a échoué.\nDe nouveaux paramètres vont être utilisés.
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index d5aed79..3af2996 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index e835f14..b238ecf 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index adce6a9..14a24aa 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index cce0b9d..333e5f1 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 085d05f..5ea9250 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 4cc12cb..4c37179 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index fb05620..3c0b9a6 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 8f590c2..7936823 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 7d1fc7e..ebcaa67 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 02fe8be..b5606a0 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/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/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index c02f2c4..236e2d4 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -27,35 +27,24 @@
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?æ?¤æ?°ç?? Cookie">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?æ?°æ?®è·?踪ç¨?åº?">
 <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该é??项ç?¨äº?é?²æ­¢æ»¥ç?¨æµ?è§?å?¨å??è?½è·?踪ç?¨æ?·ã??ä¿®æ?¹ç??å??è?½å??æ?¬ï¼?blob ç½?å??ï¼?广æ?­é??é??ï¼?æµ?è§?å?¨ç¼?å­?ï¼?cookieï¼?æ?¶è??夹å?¾æ ?ï¼?HTTP éª?è¯?头é?¨ï¼?é¢?è¿?æ?¥ï¼?localStorageï¼?mediaSource ç½?å??ï¼?OCSP 请æ±?ï¼?SharedWorker å?? TLS ä¼?è¯?票è¯?ã??">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该é??项ç?¨äº?é?²æ­¢æ»¥ç?¨æµ?è§?å?¨å??è?½è·?踪ç?¨æ?·ã??ä¿®æ?¹ç??å??è?½å??æ?¬ï¼?blob ç½?å??ï¼?广æ?­é??é??ï¼?æµ?è§?å?¨ç¼?å­?ï¼?cookieï¼?æ?¶è??夹å?¾æ ?ï¼?HTTP éª?è¯?æ ?头ï¼?é¢?è¿?æ?¥ï¼?localStorageï¼?mediaSource ç½?å??ï¼?OCSP 请æ±?ï¼?SharedWorker å?? TLS ä¼?è¯?票è¯?ã??">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ä¿®æ?¹ Tor æµ?è§?å?¨ä¸­å?¯å?ºå??ä½ ä¸?å?¶ä»? Tor ç?¨æ?·ç??ç»?è??ä¿¡æ?¯">
 <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!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 线路">

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