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

[tor-commits] [torbutton/master] Bug 25658: Replace security slider with security level UI

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbutton/master] Bug 25658: Replace security slider with security level UI
From: gk@xxxxxxxxxxxxxx
Date: Fri, 15 Mar 2019 07:12:19 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 15 Mar 2019 03:12:49 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Richard Pospesel <richard@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 5a3d6d26e1f8046b20e51d93ca9457a729063bfc
Author: Richard Pospesel <richard@xxxxxxxxxxxxxx>
Date:   Thu Mar 14 13:55:28 2019 -0700

    Bug 25658: Replace security slider with security level UI
    
    This patch has security level related changes for torbutton.
    Migrated 'security level' related strings from torbutton.dtd to new
    securityLevel.properties file, loaded by JS in the new securitylevel
    component in Tor Browser. Removed the old Security Slider xul and menu
    entry in the torbutton menu. Also 'fixed' the german (de) torbutton.dtd
    file (was valid listing of XML entities, but it broke my dtd parser used
    to migrate strings)
    
    Added new "extensions.torbutton.inserted_security_level" pref to
    torbutton that piggy backs off the existing
    "extensions.torbutton.inserted_button" pref logic. Toolbars are reset to
    the Tor Browser default when the new 'inserted_security_level' pref is
    false. Coupled with the changes in tor-browser, users which upgrade will
    have their toolbars reset to the new design.
---
 .gitignore                                       |   1 +
 src/chrome/content/popup.xul                     |   5 -
 src/chrome/content/preferences.js                | 126 ------------------
 src/chrome/content/preferences.xul               | 155 -----------------------
 src/chrome/content/torbutton.js                  |  59 ++++-----
 src/chrome/locale/af/torbutton.dtd               |   1 -
 src/chrome/locale/ak/torbutton.dtd               |   1 -
 src/chrome/locale/am/torbutton.dtd               |   1 -
 src/chrome/locale/ar/securityLevel.properties    |  16 +++
 src/chrome/locale/ar/torbutton.dtd               |   4 -
 src/chrome/locale/arn/torbutton.dtd              |   1 -
 src/chrome/locale/ast/torbutton.dtd              |   1 -
 src/chrome/locale/az/securityLevel.properties    |   1 +
 src/chrome/locale/az/torbutton.dtd               |   1 -
 src/chrome/locale/be/torbutton.dtd               |   1 -
 src/chrome/locale/bg/securityLevel.properties    |   1 +
 src/chrome/locale/bg/torbutton.dtd               |   1 -
 src/chrome/locale/bms/securityLevel.properties   |   1 +
 src/chrome/locale/bms/torbutton.dtd              |   1 -
 src/chrome/locale/bn-BD/securityLevel.properties |  16 +++
 src/chrome/locale/bn-BD/torbutton.dtd            |   4 -
 src/chrome/locale/bn-IN/torbutton.dtd            |   1 -
 src/chrome/locale/bn/torbutton.dtd               |   1 -
 src/chrome/locale/bo/torbutton.dtd               |   1 -
 src/chrome/locale/br/torbutton.dtd               |   1 -
 src/chrome/locale/bs/securityLevel.properties    |   1 +
 src/chrome/locale/bs/torbutton.dtd               |   1 -
 src/chrome/locale/ca/securityLevel.properties    |  16 +++
 src/chrome/locale/ca/torbutton.dtd               |   4 -
 src/chrome/locale/cs/securityLevel.properties    |  16 +++
 src/chrome/locale/cs/torbutton.dtd               |   4 -
 src/chrome/locale/csb/torbutton.dtd              |   1 -
 src/chrome/locale/cy/torbutton.dtd               |   1 -
 src/chrome/locale/da/securityLevel.properties    |  16 +++
 src/chrome/locale/da/torbutton.dtd               |   4 -
 src/chrome/locale/de/securityLevel.properties    |  16 +++
 src/chrome/locale/de/torbutton.dtd               |   7 +-
 src/chrome/locale/dz/torbutton.dtd               |   1 -
 src/chrome/locale/el/securityLevel.properties    |  16 +++
 src/chrome/locale/el/torbutton.dtd               |   4 -
 src/chrome/locale/en-US/securityLevel.properties |  22 ++++
 src/chrome/locale/en-US/torbutton.dtd            |   4 -
 src/chrome/locale/eo/securityLevel.properties    |   1 +
 src/chrome/locale/eo/torbutton.dtd               |   1 -
 src/chrome/locale/es-AR/securityLevel.properties |  16 +++
 src/chrome/locale/es-AR/torbutton.dtd            |   4 -
 src/chrome/locale/es/securityLevel.properties    |  16 +++
 src/chrome/locale/es/torbutton.dtd               |   4 -
 src/chrome/locale/et/torbutton.dtd               |   1 -
 src/chrome/locale/eu/securityLevel.properties    |  16 +++
 src/chrome/locale/eu/torbutton.dtd               |   4 -
 src/chrome/locale/fa/securityLevel.properties    |  16 +++
 src/chrome/locale/fa/torbutton.dtd               |   4 -
 src/chrome/locale/fi/securityLevel.properties    |   1 +
 src/chrome/locale/fi/torbutton.dtd               |   1 -
 src/chrome/locale/fil/torbutton.dtd              |   1 -
 src/chrome/locale/fo/torbutton.dtd               |   1 -
 src/chrome/locale/fr/securityLevel.properties    |  16 +++
 src/chrome/locale/fr/torbutton.dtd               |   4 -
 src/chrome/locale/fur/torbutton.dtd              |   1 -
 src/chrome/locale/fy/torbutton.dtd               |   1 -
 src/chrome/locale/ga/securityLevel.properties    |  16 +++
 src/chrome/locale/ga/torbutton.dtd               |   4 -
 src/chrome/locale/gl/securityLevel.properties    |   1 +
 src/chrome/locale/gl/torbutton.dtd               |   1 -
 src/chrome/locale/gu/securityLevel.properties    |   1 +
 src/chrome/locale/gu/torbutton.dtd               |   1 -
 src/chrome/locale/gun/torbutton.dtd              |   1 -
 src/chrome/locale/ha/torbutton.dtd               |   1 -
 src/chrome/locale/he/securityLevel.properties    |  16 +++
 src/chrome/locale/he/torbutton.dtd               |   4 -
 src/chrome/locale/hi/torbutton.dtd               |   1 -
 src/chrome/locale/hr/torbutton.dtd               |   1 -
 src/chrome/locale/ht/torbutton.dtd               |   1 -
 src/chrome/locale/hu/securityLevel.properties    |  16 +++
 src/chrome/locale/hu/torbutton.dtd               |   4 -
 src/chrome/locale/hy/torbutton.dtd               |   1 -
 src/chrome/locale/id/securityLevel.properties    |  16 +++
 src/chrome/locale/id/torbutton.dtd               |   4 -
 src/chrome/locale/is/securityLevel.properties    |  16 +++
 src/chrome/locale/is/torbutton.dtd               |   4 -
 src/chrome/locale/it/securityLevel.properties    |  16 +++
 src/chrome/locale/it/torbutton.dtd               |   4 -
 src/chrome/locale/ja/securityLevel.properties    |  16 +++
 src/chrome/locale/ja/torbutton.dtd               |   4 -
 src/chrome/locale/jv/torbutton.dtd               |   1 -
 src/chrome/locale/ka/securityLevel.properties    |  16 +++
 src/chrome/locale/ka/torbutton.dtd               |   4 -
 src/chrome/locale/km/torbutton.dtd               |   1 -
 src/chrome/locale/kn/torbutton.dtd               |   1 -
 src/chrome/locale/ko/securityLevel.properties    |  16 +++
 src/chrome/locale/ko/torbutton.dtd               |   4 -
 src/chrome/locale/ku/torbutton.dtd               |   1 -
 src/chrome/locale/kw/torbutton.dtd               |   1 -
 src/chrome/locale/ky/torbutton.dtd               |   1 -
 src/chrome/locale/lb/torbutton.dtd               |   1 -
 src/chrome/locale/lg/torbutton.dtd               |   1 -
 src/chrome/locale/ln/torbutton.dtd               |   1 -
 src/chrome/locale/lo/torbutton.dtd               |   1 -
 src/chrome/locale/lt/securityLevel.properties    |   1 +
 src/chrome/locale/lt/torbutton.dtd               |   1 -
 src/chrome/locale/lv/securityLevel.properties    |   1 +
 src/chrome/locale/lv/torbutton.dtd               |   1 -
 src/chrome/locale/mg/torbutton.dtd               |   1 -
 src/chrome/locale/mi/torbutton.dtd               |   1 -
 src/chrome/locale/mk/securityLevel.properties    |   1 +
 src/chrome/locale/mk/torbutton.dtd               |   1 -
 src/chrome/locale/ml/torbutton.dtd               |   1 -
 src/chrome/locale/mn/torbutton.dtd               |   1 -
 src/chrome/locale/mr/torbutton.dtd               |   1 -
 src/chrome/locale/ms/torbutton.dtd               |   1 -
 src/chrome/locale/mt/torbutton.dtd               |   1 -
 src/chrome/locale/my/securityLevel.properties    |   1 +
 src/chrome/locale/my/torbutton.dtd               |   1 -
 src/chrome/locale/nah/torbutton.dtd              |   1 -
 src/chrome/locale/nap/torbutton.dtd              |   1 -
 src/chrome/locale/nb/securityLevel.properties    |  16 +++
 src/chrome/locale/nb/torbutton.dtd               |   4 -
 src/chrome/locale/ne/torbutton.dtd               |   1 -
 src/chrome/locale/nl/securityLevel.properties    |  16 +++
 src/chrome/locale/nl/torbutton.dtd               |   4 -
 src/chrome/locale/nn/torbutton.dtd               |   1 -
 src/chrome/locale/nso/torbutton.dtd              |   1 -
 src/chrome/locale/oc/torbutton.dtd               |   1 -
 src/chrome/locale/or/torbutton.dtd               |   1 -
 src/chrome/locale/pa/torbutton.dtd               |   1 -
 src/chrome/locale/pap/torbutton.dtd              |   1 -
 src/chrome/locale/pl/securityLevel.properties    |  16 +++
 src/chrome/locale/pl/torbutton.dtd               |   4 -
 src/chrome/locale/pms/torbutton.dtd              |   1 -
 src/chrome/locale/ps/torbutton.dtd               |   1 -
 src/chrome/locale/pt-BR/securityLevel.properties |  16 +++
 src/chrome/locale/pt-BR/torbutton.dtd            |   4 -
 src/chrome/locale/pt/securityLevel.properties    |   1 +
 src/chrome/locale/pt/torbutton.dtd               |   4 -
 src/chrome/locale/ro/securityLevel.properties    |   1 +
 src/chrome/locale/ro/torbutton.dtd               |   1 -
 src/chrome/locale/ru/securityLevel.properties    |  16 +++
 src/chrome/locale/ru/torbutton.dtd               |   4 -
 src/chrome/locale/sco/torbutton.dtd              |   1 -
 src/chrome/locale/sk/securityLevel.properties    |   1 +
 src/chrome/locale/sk/torbutton.dtd               |   1 -
 src/chrome/locale/sl/securityLevel.properties    |   1 +
 src/chrome/locale/sl/torbutton.dtd               |   1 -
 src/chrome/locale/so/torbutton.dtd               |   1 -
 src/chrome/locale/son/torbutton.dtd              |   1 -
 src/chrome/locale/sq/torbutton.dtd               |   1 -
 src/chrome/locale/sr/securityLevel.properties    |   1 +
 src/chrome/locale/sr/torbutton.dtd               |   1 -
 src/chrome/locale/st/torbutton.dtd               |   1 -
 src/chrome/locale/su/torbutton.dtd               |   1 -
 src/chrome/locale/sv/securityLevel.properties    |  16 +++
 src/chrome/locale/sv/torbutton.dtd               |   4 -
 src/chrome/locale/sw/torbutton.dtd               |   1 -
 src/chrome/locale/ta/torbutton.dtd               |   1 -
 src/chrome/locale/te/torbutton.dtd               |   1 -
 src/chrome/locale/tg/torbutton.dtd               |   1 -
 src/chrome/locale/th/torbutton.dtd               |   1 -
 src/chrome/locale/ti/torbutton.dtd               |   1 -
 src/chrome/locale/tk/torbutton.dtd               |   1 -
 src/chrome/locale/tr/securityLevel.properties    |  16 +++
 src/chrome/locale/tr/torbutton.dtd               |   4 -
 src/chrome/locale/uk/securityLevel.properties    |   1 +
 src/chrome/locale/uk/torbutton.dtd               |   1 -
 src/chrome/locale/ur/torbutton.dtd               |   1 -
 src/chrome/locale/ve/torbutton.dtd               |   1 -
 src/chrome/locale/vi/securityLevel.properties    |  16 +++
 src/chrome/locale/vi/torbutton.dtd               |   4 -
 src/chrome/locale/wa/torbutton.dtd               |   1 -
 src/chrome/locale/wo/torbutton.dtd               |   1 -
 src/chrome/locale/zh-CN/securityLevel.properties |  16 +++
 src/chrome/locale/zh-CN/torbutton.dtd            |   4 -
 src/chrome/locale/zh-HK/torbutton.dtd            |   1 -
 src/chrome/locale/zh-TW/securityLevel.properties |  16 +++
 src/chrome/locale/zh-TW/torbutton.dtd            |   4 -
 src/chrome/locale/zu/torbutton.dtd               |   1 -
 src/defaults/preferences/preferences.js          |   1 +
 trans_tools/import-translations.sh               |   1 +
 178 files changed, 566 insertions(+), 541 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..5fff1d9c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+pkg
diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul
index 582593f6..5d9b76ce 100644
--- a/src/chrome/content/popup.xul
+++ b/src/chrome/content/popup.xul
@@ -27,11 +27,6 @@
                   insertafter="context-stop"
                   hidden="true"
                   oncommand="torbutton_open_cookie_dialog()"/>
-        <menuitem id="torbutton-preferences"
-                  label="&torbutton.context_menu.preferences;"
-                  accesskey="&torbutton.context_menu.preferences.key;"
-                  insertafter="context-stop"
-                  oncommand="torbutton_open_prefs_dialog()"/>
         <menuitem id="torbutton-networksettings"
                   label="&torbutton.context_menu.networksettings;"
                   accesskey="&torbutton.context_menu.networksettings.key;"
diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
deleted file mode 100644
index 81668d6e..00000000
--- a/src/chrome/content/preferences.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// # Security Settings User Interface
-
-// Utilities
-let { utils: Cu } = Components;
-let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } =
-    Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs;
-
-let { getLocale, show_torbrowser_manual } =
-    Cu.import("resource://torbutton/modules/utils.js", {});
-
-// Description elements have the follow names.
-const descNames =
-      [, "desc_safest", "desc_safer", "desc_standard"];
-// "Learn-more"-elements have the follow names.
-const linkNames =
-      [, "link_safest", "link_safer", "link_standard"];
-// A single `state` object that reflects the user settings in this UI.
-
-let state = { slider : 0, custom : false};
-
-// Utility functions to convert between the legacy 4-value pref index
-// and the 3-valued security slider.
-let sliderPositionToPrefSetting = pos => [, 1, 2, 4][pos];
-let prefSettingToSliderPosition = pref => [, 1, 2, 2, 3][pref];
-
-// Set the desired slider value and update UI.
-function torbutton_set_slider(sliderPosition) {
-  state.slider = sliderPosition;
-  let slider = document.getElementById("torbutton_sec_slider");
-  slider.value = sliderPosition;
-  let descs = descNames.map(name => document.getElementById(name));
-  descs.forEach((desc, i) => desc.collapsed = sliderPosition !== i);
-};
-
-// Set the desired custom value and update UI.
-function torbutton_set_custom(customValue) {
-  state.custom = customValue;
-  let sliderSettings = document.getElementById("torbutton_slider_settings");
-  let customSettings = document.getElementById("torbutton_custom_settings");
-  sliderSettings.hidden = customValue;
-  customSettings.hidden = !customValue;
-};
-
-// Read prefs 'extensions.torbutton.security_slider' and
-// 'extensions.torbutton.security_custom', and initialize the UI.
-function torbutton_init_security_ui() {
-  torbutton_set_slider(prefSettingToSliderPosition(
-    getIntPref("extensions.torbutton.security_slider")));
-  torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom"));
-  torbutton_set_learn_more_links();
-  // Make sure the "Accept"-button is focused when we show the dialog and not a
-  // possible "Learn more"-link. See: comment:16 in bug 21847.
-  let okBtn = document.documentElement.getButton("accept");
-  if (okBtn)
-    okBtn.focus();
-  setTimeout(adjustDialogSize, 0);
-};
-
-// Write the two prefs from the current settings.
-function torbutton_save_security_settings() {
-  setIntPref("extensions.torbutton.security_slider",
-             sliderPositionToPrefSetting(state.slider));
-  setBoolPref("extensions.torbutton.security_custom", state.custom);
-};
-
-// We follow the way we treat the links to the Tor Browser User Manual on the
-// Help Menu and on about:tor: if we have the manual available for a locale,
-// let's show the "Learn more"-link, otherwise hide it.
-function torbutton_set_learn_more_links() {
-  let show_manual = show_torbrowser_manual();
-  let locale = ""
-  if (show_manual) {
-    locale = getLocale();
-  }
-  let links = linkNames.map(name => document.getElementById(name));
-  links.forEach(link => {;
-    if (show_manual && locale != "") {
-      link.href= "https:/tb-manual.torproject.org/" + locale +
-        "/security-slider.html";
-      link.hidden = false;
-    } else {
-      link.hidden = true;
-    }
-  });
-}
-
-// Increase the height of this window so that a vertical scrollbar is not
-// needed on the description box.
-function adjustDialogSize() {
-  try {
-    // Find the height required by the tallest description element.
-    let descHeight = 0;
-    let descs = descNames.map(name => document.getElementById(name));
-    descs.forEach(elem => {
-      let origCollapsed = elem.collapsed;
-      elem.collapsed = false;
-      let h = elem.scrollHeight;
-      elem.collapsed = origCollapsed;
-      if (h > descHeight)
-        descHeight = h;
-    });
-
-    // Cap the height (just in case).
-    const kMaxDescriptionHeight = 550;
-    if (descHeight > kMaxDescriptionHeight)
-      descHeight = kMaxDescriptionHeight;
-
-    // Increase the height of the description container if it is too short.
-    let boxElem = document.getElementById("descBox");
-    if (boxElem.clientHeight < descHeight) {
-      boxElem.setAttribute("height", descHeight);
-
-      // Resize the XUL window to account for the new description height. In
-      // order for sizeToContent() to work correctly, it seems that we must
-      // remove the height attribute from the dialog (that attribute is added
-      // after a user manually resizes the window).
-      document.documentElement.removeAttribute("height");
-      sizeToContent();
-    }
-  } catch (e) {}
-
-  // Show a scrollbar for the description text if one is needed.
-  // To avoid bug 21330, we set the overflow=auto style here instead
-  // of directly in the XUL.
-  document.getElementById("descBox").style.overflow = "auto";
-}
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
deleted file mode 100644
index a6fabff3..00000000
--- a/src/chrome/content/preferences.xul
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://torbutton/skin/preferences.css" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd">
-
-<dialog id="torbutton-prefs"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-        xmlns:html="http://www.w3.org/1999/xhtml";
-        title="&torbutton.prefs.security_settings;"
-        buttons="accept,cancel"
-        persist="screenX screenY width height"
-        onload="torbutton_init_security_ui()"
-        align="stretch"
-        pack="center"
-        maxheight="600"
-        minwidth="400"
-        maxwidth="800"
-        ondialogaccept="torbutton_save_security_settings()"
-        width="500" >
-
-    <script type="application/x-javascript" src="torbutton_util.js"/>
-    <script type="application/x-javascript" src="preferences.js"/>
-    <vbox flex="1" align="stretch">
-        <groupbox align="stretch" flex="1"> <!-- security settings container -->
-          <caption label="&torbutton.prefs.sec_caption;"/>
-          <hbox id="torbutton_slider_settings" flex="1" align="stretch" hidden="false">
-            <vbox>
-              <hbox flex="1" minheight="220">
-                <vbox>
-                  <scale id="torbutton_sec_slider" flex="1" min="1" max="3"
-                         movetoclick="true" orient="vertical"
-                         onchange="torbutton_set_slider(this.value)"/>
-                </vbox>
-                <vbox>
-                  <hbox flex="1" align="start">
-                    <description id="torbutton_sec_safest"
-                                 onclick="torbutton_set_slider(1);"
-                                 tooltip="safest_preview">
-                      &torbutton.prefs.sec_safest_label;
-                    </description>
-                  </hbox>
-                  <hbox flex="1" align="center">
-                    <description id="torbutton_sec_safer"
-                                 onclick="torbutton_set_slider(2);"
-                                 tooltip="safer_preview">
-                      &torbutton.prefs.sec_safer_label;
-                    </description>
-                  </hbox>
-                  <hbox flex="1" align="end">
-                    <description id="torbutton_sec_standard"
-                                 onclick="torbutton_set_slider(3);"
-                                 tooltip="standard_preview">
-                      &torbutton.prefs.sec_standard_label;
-                    </description>
-                  </hbox>
-                </vbox>
-              </hbox>
-            </vbox>
-            <vbox id="descBox" flex="1" style="overflow: hidden;">
-              <vbox id="desc_safest" collapsed="true">
-                <description
-                  class="slider-text-size, slider-text-weight">
-                  &torbutton.prefs.sec_safest_description;
-                </description>
-                <separator orient="horizontal" class="thin"/>
-                <description class="slider-text-size, slider-text-weight">
-                  &torbutton.prefs.sec_safest_list_label;
-                </description>
-                <description class="slider-text-size">
-                  &torbutton.prefs.sec_js_disabled;
-                </description>
-                <description class="slider-text-size">
-                  &torbutton.prefs.sec_limit_graphics_and_typography;
-                </description>
-                <description class="slider-text-size">
-                  &torbutton.prefs.sec_click_to_play_media;
-                </description>
-                <separator orient="horizontal" class="thin"/>
-                <label id="link_safest" class="text-link">
-                  &torbutton.prefs.sec_learn_more_label;
-                </label>
-              </vbox>
-              <vbox id="desc_safer" collapsed="true">
-                <description
-                  class="slider-text-size, slider-text-weight">
-                  &torbutton.prefs.sec_safer_description;
-                </description>
-                <separator orient="horizontal" class="thin"/>
-                <description class="slider-text-size, slider-text-weight">
-                  &torbutton.prefs.sec_safer_list_label;
-                </description>
-                <description class="slider-text-size">
-                  &torbutton.prefs.sec_js_on_https_sites_only;
-                </description>
-                <description class="slider-text-size">
-                  &torbutton.prefs.sec_limit_typography;
-                </description>
-                <description class="slider-text-size">
-                  &torbutton.prefs.sec_click_to_play_media;
-                </description>
-                <separator orient="horizontal" class="thin"/>
-                <label id="link_safer" class="text-link">
-                  &torbutton.prefs.sec_learn_more_label;
-                </label>
-              </vbox>
-              <vbox id="desc_standard" collapsed="false">
-                <description
-                  class="slider-text-size, slider-text-weight">
-                  &torbutton.prefs.sec_standard_description;
-                </description>
-                <separator orient="horizontal" class="thin"/>
-                <label id="link_standard" class="text-link">
-                  &torbutton.prefs.sec_learn_more_label;
-                </label>
-              </vbox>
-            </vbox>
-          </hbox>
-          <vbox id="torbutton_custom_settings"
-                hidden="true"
-                width="300"
-                height="200"
-                style="overflow:auto;">
-            <description>
-              &torbutton.prefs.custom_warning;
-            </description>
-            <hbox>
-              <button id="torbutton_restore_defaults_button"
-                      oncommand="torbutton_set_custom(false);"
-                      label="&torbutton.prefs.restore_defaults;"/>
-            </hbox>
-          </vbox>
-        </groupbox>
-      </vbox>
-
-   <tooltip id="safest_preview">
-     <html:b>&torbutton.prefs.sec_safest_list_label;</html:b>
-     <html:br></html:br>
-     <html:br></html:br>
-     <html:div>&torbutton.prefs.sec_js_disabled;</html:div>
-     <html:div>&torbutton.prefs.sec_limit_graphics_and_typography;</html:div>
-     <html:div>&torbutton.prefs.sec_click_to_play_media;</html:div>
-   </tooltip>
-   <tooltip id="safer_preview">
-     <html:b>&torbutton.prefs.sec_safer_list_label;</html:b>
-     <html:br></html:br>
-     <html:br></html:br>
-     <html:div>&torbutton.prefs.sec_js_on_https_sites_only;</html:div>
-     <html:div>&torbutton.prefs.sec_limit_typography;</html:div>
-     <html:div>&torbutton.prefs.sec_click_to_play_media;</html:div>
-   </tooltip>
-   <tooltip id="standard_preview">
-     <html:b>&torbutton.prefs.sec_standard_description;</html:b>
-   </tooltip>
- </dialog>
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index b425a276..15e8d174 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -125,7 +125,7 @@ var torbutton_unique_pref_observer =
               * registers. Thankfully, these notifications arrive only on
               * the main thread, *however*, our confirmation dialog suspends
               * execution and allows more events to arrive until it is answered
-              */ 
+              */
              if (!m_tb_confirming_plugins) {
                m_tb_confirming_plugins = true;
                torbutton_confirm_plugins();
@@ -368,22 +368,27 @@ function torbutton_init() {
     //if (contextMenu)
     //  contextMenu.addEventListener("popupshowing", torbutton_check_contextmenu, false);
 
-    // Add toolbutton to the bar.
+    // Add torbutton and security level button to the bar.
     // This should maybe be in the startup function, but we want to add
     // the button to the panel before it's state (color) is set..
-    if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button")) {
+    if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button") ||
+        !m_tb_prefs.getBoolPref("extensions.torbutton.inserted_security_level")) {
       torbutton_log(3, 'Adding button');
       try {
         // ESR31-style toolbar is handled by the existing compiled-in pref.
         // We also need to prevent first-run toolbar reorg (#13378), so we
         // reset this toolbar state on first-run.
         try {
+          // reverts the serialized toolbar state to default set in Tor Browser
           m_tb_prefs.clearUserPref("browser.uiCustomization.state");
         } catch(e) {}
+        // reverts toolbar state to firefox defaults
         CustomizableUI.reset();
+        // 'restores' toolbar state from serialized state in "browser.uiCustomization.state"
         CustomizableUI.undoReset();
         torbutton_log(3, 'Button added');
         m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true);
+        m_tb_prefs.setBoolPref("extensions.torbutton.inserted_security_level", true);
       } catch(e) {
         torbutton_log(4, 'Failed to add Torbutton to toolbar: '+e);
       }
@@ -477,7 +482,7 @@ function torbutton_confirm_plugins() {
     torbutton_log(3, "False positive on plugin notification. Ignoring");
     return;
   }
-  
+
   torbutton_log(3, "Confirming plugin usage.");
 
   var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"]
@@ -485,7 +490,7 @@ function torbutton_confirm_plugins() {
 
   // Display two buttons, both with string titles.
   var flags = prompts.STD_YES_NO_BUTTONS + prompts.BUTTON_DELAY_ENABLE;
-      
+
   var message = torbutton_get_property_string("torbutton.popup.confirm_plugins");
   var askAgainText = torbutton_get_property_string("torbutton.popup.never_ask_again");
   var askAgain = {value: false};
@@ -500,7 +505,7 @@ function torbutton_confirm_plugins() {
 
   // The pref observer for "plugin.disable" will set the appropriate plugin state.
   // So, we only touch the pref if it has changed.
-  if (no_plugins != 
+  if (no_plugins !=
       m_tb_prefs.getBoolPref("plugin.disable"))
     m_tb_prefs.setBoolPref("plugin.disable", no_plugins);
   else
@@ -511,12 +516,12 @@ function torbutton_confirm_plugins() {
   var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                      .getService(Components.interfaces.nsIWindowMediator);
   var browserEnumerator = wm.getEnumerator("navigator:browser");
- 
+
   // Check each browser instance for our URL
   while (browserEnumerator.hasMoreElements()) {
     var browserWin = browserEnumerator.getNext();
     var tabbrowser = browserWin.gBrowser;
- 
+
     // Check each tab of this browser instance
     var numTabs = tabbrowser.browsers.length;
     for (var index = 0; index < numTabs; index++) {
@@ -650,7 +655,7 @@ function torbutton_do_async_versioncheck() {
     req.open('GET', url, true);
     req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE;
     req.overrideMimeType("text/json");
-    req.onreadystatechange = function (oEvent) {  
+    req.onreadystatechange = function (oEvent) {
       if (req.readyState === 4) {
         if(req.status == 200) {
           if(!req.responseText) {
@@ -696,8 +701,8 @@ function torbutton_do_async_versioncheck() {
         }
         torbutton_log(5, "Version check failed! Web server error: "+req.status);
         return -1;
-      }  
-    };  
+      }
+    };
     req.send(null);
   } catch(e) {
     if(e.result == 0x80004005) { // NS_ERROR_FAILURE
@@ -1651,13 +1656,6 @@ function torbutton_open_cookie_dialog() {
              'Cookie Protections', 'centerscreen,chrome,dialog,modal,resizable');
 }
 
-// Bug 1506 P2/P3: Prefs are handled differently on android, I guess?
-function torbutton_open_prefs_dialog() {
-  showDialog(window, "chrome://torbutton/content/preferences.xul",
-             "torbutton-preferences","centerscreen, chrome");
-  torbutton_log(2, 'opened preferences window');
-}
-
 // -------------- HISTORY & COOKIES ---------------------
 
 // Bug 1506 P4: Used by New Identity if cookie protections are
@@ -1666,7 +1664,7 @@ function torbutton_clear_cookies() {
     torbutton_log(2, 'called torbutton_clear_cookies');
     var cm = Components.classes["@mozilla.org/cookiemanager;1"]
                     .getService(Components.interfaces.nsICookieManager);
-   
+
     cm.removeAll();
 }
 
@@ -1688,7 +1686,7 @@ function torbutton_disable_browser_js(browser) {
     } catch(e) {
         torbutton_log(4, "Failed to disable JS events: "+e)
     }
-   
+
     if (browser.docShell)
       browser.docShell.allowJavascript = false;
 
@@ -1721,9 +1719,9 @@ function torbutton_disable_window_js(win) {
         var b = browser.browsers[i];
         if (b && !b.docShell) {
             try {
-                if (b.currentURI) 
+                if (b.currentURI)
                     torbutton_log(5, "DocShell is null for: "+b.currentURI.spec);
-                else 
+                else
                     torbutton_log(5, "DocShell is null for unknown URL");
             } catch(e) {
                 torbutton_log(5, "DocShell is null for unparsable URL: "+e);
@@ -1867,12 +1865,12 @@ function torbutton_is_windowed(wind) {
         torbutton_log(2, "Window is fullScreen");
         return false;
     }
-    if(wind.outerHeight == wind.screen.availHeight 
+    if(wind.outerHeight == wind.screen.availHeight
             && wind.outerWidth == wind.screen.availWidth) {
         torbutton_log(3, "Window is ratpoisoned/evilwm'ed");
         return false;
     }
-        
+
     torbutton_log(2, "Window is normal");
     return true;
 }
@@ -1955,12 +1953,7 @@ function torbutton_new_window(event)
                                    Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
     }
 
-    // Register the TorOpenSecuritySettings observer, which is used by
-    // UITour to open the security slider dialog.
-    stopOpenSecuritySettingsObserver = observe("TorOpenSecuritySettings",
-                                               torbutton_open_prefs_dialog);
-
-    // Check the version on every new window. We're already pinging check in these cases.    
+    // Check the version on every new window. We're already pinging check in these cases.
     torbutton_do_async_versioncheck();
 
     torbutton_do_tor_check();
@@ -1977,9 +1970,9 @@ function torbutton_close_window(event) {
         false);
 
     // TODO: This is a real ghetto hack.. When the original window
-    // closes, we need to find another window to handle observing 
-    // unique events... The right way to do this is to move the 
-    // majority of torbutton functionality into a XPCOM component.. 
+    // closes, we need to find another window to handle observing
+    // unique events... The right way to do this is to move the
+    // majority of torbutton functionality into a XPCOM component..
     // But that is a major overhaul..
     if (m_tb_is_main_window) {
         torbutton_log(3, "Original window closed. Searching for another");
diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ak/torbutton.dtd
+++ b/src/chrome/locale/ak/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/am/torbutton.dtd
+++ b/src/chrome/locale/am/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ar/securityLevel.properties b/src/chrome/locale/ar/securityLevel.properties
new file mode 100644
index 00000000..c8e3c161
--- /dev/null
+++ b/src/chrome/locale/ar/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Ù?Ø³ØªÙ?Ù? Ø§Ù?Ø£Ù?Ø§Ù?
+securityLevel.standard.level = Ø¹Ø§Ø¯Ù?
+securityLevel.standard.summary = Ù?Ù? Ø®ØµØ§Ø¦Øµ Ù?ØªØµÙ?Ø ØªÙ?Ø± Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ù?Ø¨ Ù?Ù?Ø¹Ù?Ø©
+securityLevel.safer.level = Ø¢Ù?Ù?Ù?
+securityLevel.safer.summary = Ù?Ø¹Ø·Ù? Ù?Ù?Ù?Ø²Ø§Øª Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ù?Ø¨ Ø§Ù?ØªÙ? Ø¹Ø§Ø¯Ø© Ù?Ø§ ØªÙ?Ù?Ù? Ø®Ø·Ù?Ø±Ø©. Ù?ØªØ³Ø¨Ø¨ Ù?Ù? ØªØ¹Ø·Ù? Ø®ØµØ§Ø¦Øµ Ø¨Ø¹Ø¶ Ø§Ù?Ù?Ù?Ø§Ù?Ø¹.
+securityLevel.safer.description1 = ØªØ¹Ø·Ù? Ø¬Ø§Ù?Ø§ Ø³Ù?Ø±Ø¨Øª  Ø¹Ù?Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?ØªÙ? Ù?Ø§ ØªØ³ØªØ®Ø¯Ù? HTTPS
+securityLevel.safer.description2 = ØªØ¹Ø·Ù?Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ø®Ø·Ù?Ø· Ù?Ø§Ù?Ø±Ù?Ù?Ø² Ø§Ù?Ø±Ù?Ø§Ø¶Ù?Ø©.
+securityLevel.safer.description3 = Ø§Ù?ØµÙ?Øª Ù?Ø§Ù?Ù?Ù?Ø¯Ù?Ù? Ù?ØØªØ§Ø¬ Ù?Ù?Ù?Ù?Ø± Ù?ØªØ´ØºÙ?Ù?Ù?.
+securityLevel.safest.level = Ø§Ù?Ø£Ù?Ø«Ø± Ø£Ù?Ù?Ø§
+securityLevel.safest.summary = Ø§Ø³Ù?Ø Ù?Ù?Ø· Ø¨Ø§Ù?Ø®ØµØ§Ø¦Øµ Ø§Ù?Ù?Ø·Ù?Ù?Ø¨Ø© Ù?Ù?Ù?Ù?Ø§Ù?Ø¹ ØºÙ?Ø± Ø§Ù?Ø¯Ù?Ù?Ø§Ù?Ù?Ù?Ù?Ø© Ù?Ø§Ù?Ø®Ø¯Ù?Ø§Øª Ø§Ù?Ø£Ø³Ø§Ø³Ù?Ø©. ØªØ¤Ø«Ø± Ù?Ø°Ù? Ø§Ù?ØªØºÙ?Ù?Ø±Ø§Øª Ø¹Ù?Ù? Ø§Ù?ØµÙ?Ø± Ù?Ø§Ù?Ù?Ø³Ø§Ø¦Ø· Ù?Ø§Ù?Ù?ØµÙ?Øµ Ø§Ù?Ø¨Ø±Ù?Ø¬Ù?Ø©.
+securityLevel.safest.description1 = ØªØ¹Ø·Ù? Ø¬Ø§Ù?Ø§ Ø³Ù?Ø±Ø¨Øª Ù?Ø¨Ø¯Ø¦Ù?Ø§ Ø¹Ù?Ù? Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ø§Ù?Ø¹.
+securityLevel.safest.description2 = ØªØ¹Ø·Ù?Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ø®Ø·Ù?Ø· Ù?Ø§Ù?Ø£Ù?Ù?Ù?Ù?Ø§Øª Ù?Ø§Ù?Ø±Ù?Ù?Ø² Ø§Ù?Ø±Ù?Ø§Ø¶Ù?Ø© Ù?Ø§Ù?ØµÙ?Ø±.
+securityLevel.safest.description3 = Ø§Ù?ØµÙ?Øª Ù?Ø§Ù?Ù?Ù?Ø¯Ù?Ù? Ù?ØØªØ§Ø¬ Ù?Ù?Ù?Ù?Ø± Ù?ØªØ´ØºÙ?Ù?Ù?.
+securityLevel.custom.summary = ØªÙ?Ø¶Ù?Ù?Ø§ØªÙ? Ø§Ù?Ø®Ø§ØµØ© Ù?Ù?Ù?ØªØµÙ?Ø ØªØ³Ø¨Ø¨Øª Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£Ù?Ø§Ù? ØºÙ?Ø± Ù?Ø¹ØªØ§Ø¯Ø©. Ù?Ø£Ù?Ø§Ù? Ù?Ø®ØµÙ?ØµÙ?Ø© Ø£Ù?Ø¶Ù? Ù?Ù?ØµØ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? Ø£ØØ¯ Ù?Ø³ØªÙ?Ù?Ø§Øª Ø§Ù?Ø£Ù?Ø§Ù? Ø§Ù?Ù?Ø¨Ø¯Ø¦Ù?Ø©.
+securityLevel.learnMore = ØªØ¹Ø±Ù?Ù? Ø¹Ù?Ù? Ø§Ù?Ù?Ø²Ù?Ø¯
+securityLevel.restoreDefaults = Ø§Ø³ØªØ¹Ø¯ Ø§Ù?Ø¥Ø¹Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ø¨Ø¯Ø¦Ù?Ø©
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index baa7e5ff..9c2b5292 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ø¯Ø§Ø¦Ø±Ø© ØªÙ?Ø± Ø¬Ø¯Ù?Ø¯Ø© Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ù?Ø¹">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø£Ù?Ø§Ù?...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨Ù?Ø© ØªÙ?Ø±...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "ØªØÙ?Ù? Ù?Ù? ØªØØ¯Ù?Ø«Ø§Øª Ù?ØªØµÙ?Ø ØªÙ?Ø±...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ø§Ù?Ù?Ø± Ù?Ø¨Ø¯Ø¡ Ø²Ø± ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.security_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£Ù?Ø§Ù? Ù?ØªØµÙ?Ø Ø·Ù?Ø±">
-<!ENTITY torbutton.prefs.restore_defaults "Ø§Ø³ØªØ¹Ø¯ Ø§Ù?Ø¥Ø¹Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ø¨Ø¯Ø¦Ù?Ø©">
-<!ENTITY torbutton.prefs.custom_warning "ØªÙ?Ø¶Ù?Ù?Ø§ØªÙ? Ø§Ù?Ø®Ø§ØµØ© Ù?Ù?Ù?ØªØµÙ?Ø ØªØ³Ø¨Ø¨Øª Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£Ù?Ø§Ù? ØºÙ?Ø± Ù?Ø¹ØªØ§Ø¯Ø©. Ù?Ø£Ù?Ø§Ù? Ù?Ø®ØµÙ?ØµÙ?Ø© Ø£Ù?Ø¶Ù? Ù?Ù?ØµØ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? Ø£ØØ¯ Ù?Ø³ØªÙ?Ù?Ø§Øª Ø§Ù?Ø£Ù?Ø§Ù? Ø§Ù?Ù?Ø¨Ø¯Ø¦Ù?Ø©.">
 <!ENTITY torbutton.cookiedialog.title "Ø¥Ø¯Ø§Ø±Ø© Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§Ù?ØÙ?Ø§Ù?Ø© Ù?Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø·">
 <!ENTITY torbutton.cookiedialog.lockCol "Ù?ØÙ?Ù?Ø©">
 <!ENTITY torbutton.cookiedialog.domainCol "Ø§Ø³ØªØ¶Ø§Ù?Ø©">
diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/arn/torbutton.dtd
+++ b/src/chrome/locale/arn/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ast/torbutton.dtd
+++ b/src/chrome/locale/ast/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/az/securityLevel.properties b/src/chrome/locale/az/securityLevel.properties
new file mode 100644
index 00000000..16b086a7
--- /dev/null
+++ b/src/chrome/locale/az/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = VarsayÄ±lanlarÄ± yenidÉ?n yÃ¼klÉ?
diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd
index 5a5f20ca..589c6fe2 100644
--- a/src/chrome/locale/az/torbutton.dtd
+++ b/src/chrome/locale/az/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "TordÃ¼ymÉ?sini baÅ?latmaq Ã¼Ã§Ã¼n kliklÉ?yin">
-<!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lanlarÄ± yenidÉ?n yÃ¼klÉ?">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/be/torbutton.dtd
+++ b/src/chrome/locale/be/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/bg/securityLevel.properties b/src/chrome/locale/bg/securityLevel.properties
new file mode 100644
index 00000000..6d147b67
--- /dev/null
+++ b/src/chrome/locale/bg/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Ð?Ñ?Ð·Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸Ñ?Ðµ
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 289efda2..52adc2ec 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Ð?Ñ?Ð·Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸Ñ?Ðµ">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/bms/securityLevel.properties b/src/chrome/locale/bms/securityLevel.properties
new file mode 100644
index 00000000..8cbfd400
--- /dev/null
+++ b/src/chrome/locale/bms/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = á??á?°á??á?¡á?±á?»á??á?¡á?±á??á??á?á?¯á?? á?»á??á??á?¹á??á??á?¹ á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á??á?¹
diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index 8a7c8252..773b9efa 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -1,7 +1,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton á??á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«">
-<!ENTITY torbutton.prefs.restore_defaults "á??á?°á??á?¡á?±á?»á??á?¡á?±á??á??á?á?¯á?? á?»á??á??á?¹á??á??á?¹ á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á??á?¹">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/bn-BD/securityLevel.properties b/src/chrome/locale/bn-BD/securityLevel.properties
new file mode 100644
index 00000000..731353ea
--- /dev/null
+++ b/src/chrome/locale/bn-BD/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾à¦° à¦®à¦¾à¦¤à§?à¦°à¦¾
+securityLevel.standard.level = à¦®à¦¾à¦¨
+securityLevel.standard.summary = à¦¸à¦®à¦¸à§?à¦¤ à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦?à¦¬à¦? à¦?à¦¯à¦¼à§?à¦¬à¦¸à¦¾à¦?à¦? à¦¬à§?à¦¶à¦¿à¦·à§?à¦?à§?à¦¯ à¦¸à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦¹à¦¯à¦¼à¥¤
+securityLevel.safer.level = à¦¨à¦¿à¦°à¦¾à¦ªà¦¦
+securityLevel.safer.summary = à¦?à¦¯à¦¼à§?à¦¬à¦¸à¦¾à¦?à¦?à§?à¦° à¦¬à§?à¦¶à¦¿à¦·à§?à¦?à§?à¦¯à¦?à§?à¦²à¦¿ à¦ªà§?à¦°à¦¾à¦¯à¦¼à¦? à¦¬à¦¿à¦ªà¦?à§?à¦?à¦¨à¦? à¦?à¦°à§?, à¦¯à¦¾ à¦?à¦¿à¦?à§? à¦¸à¦¾à¦?à¦?à¦?à§?à¦²à¦¿ à¦?à¦¾à¦°à§?à¦¯à¦?à¦¾à¦°à¦¿à¦¤à¦¾ à¦¹à¦¾à¦°à¦¾à¦¤à§? à¦¬à¦¾à¦§à¦¾ à¦¦à§?à¦¯à¦¼à¥¤
+securityLevel.safer.description1 = Non-HTTPS à¦¸à¦¾à¦?à¦?à¦?à§?à¦²à¦¿à¦¤à§? à¦?à¦¾à¦à¦¾à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦?à¦?à§?à¦·à¦® à¦?à¦°à¦¾ à¦?à¦?à§?à¥¤
+securityLevel.safer.description2 = à¦?à¦¿à¦?à§? à¦«à¦¨à§?à¦? à¦?à¦¬à¦? à¦?à¦£à¦¿à¦¤ à¦?à¦¿à¦¹à§?à¦¨ à¦?à¦?à§?à¦·à¦® à¦?à¦?à§?à¥¤
+securityLevel.safer.description3 = à¦?à¦¡à¦¿à¦? à¦?à¦¬à¦? à¦à¦¿à¦¡à¦¿à¦? (HTML5 à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾) à¦?à§?à¦²à¦¿à¦?-à¦?à§?-à¦?à§?à¦²à¦¾à¥¤
+securityLevel.safest.level = à¦¨à¦¿à¦°à¦¾à¦ªà¦¦
+securityLevel.safest.summary = à¦¶à§?à¦§à§?à¦®à¦¾à¦¤à§?à¦° à¦¸à§?à¦¥à¦¾à¦¯à¦¼à§? à¦¸à¦¾à¦?à¦? à¦?à¦¬à¦? à¦®à§?à¦²à¦¿à¦? à¦ªà¦°à¦¿à¦·à§?à¦¬à¦¾à¦?à§?à¦²à¦¿à¦° à¦?à¦¨à§?à¦¯ à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨à§?à¦¯à¦¼ à¦?à¦¯à¦¼à§?à¦¬à¦¸à¦¾à¦?à¦? à¦¬à§?à¦¶à¦¿à¦·à§?à¦?à§?à¦¯à¦?à§?à¦²à¦¿ à¦®à¦?à§?à¦?à§?à¦°à¦¿ à¦¦à§?à¦¯à¦¼ à¦?à¦? à¦ªà¦°à¦¿à¦¬à¦°à§?à¦¤à¦¨à¦?à§?à¦²à¦¿ à¦?à¦®à§?à¦?, à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾ à¦?à¦¬à¦? à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦?à¦?à§?à¦²à¦¿ à¦ªà§?à¦°à¦à¦¾à¦¬à¦¿à¦¤ à¦?à¦°à§?à¥¤
+securityLevel.safest.description1 = à¦?à¦¾à¦à¦¾à¦¸à§?à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦¸à¦¬ à¦¸à¦¾à¦?à¦?à§? à¦¡à¦¿à¦«à¦²à§?à¦? à¦¦à§?à¦¬à¦¾à¦°à¦¾ à¦¨à¦¿à¦·à§?à¦?à§?à¦°à¦¿à¦¯à¦¼ à¦?à¦°à¦¾ à¦¹à¦¯à¦¼à¥¤
+securityLevel.safest.description2 = à¦?à¦¿à¦?à§? à¦«à¦¨à§?à¦?, à¦?à¦?à¦?à¦¨, à¦?à¦£à¦¿à¦¤ à¦ªà§?à¦°à¦¤à§?à¦? à¦?à¦¬à¦? à¦?à¦¬à¦¿ à¦?à¦?à§?à¦·à¦® à¦°à¦¯à¦¼à§?à¦?à§?à¥¤
+securityLevel.safest.description3 = à¦?à¦¡à¦¿à¦? à¦?à¦¬à¦? à¦à¦¿à¦¡à¦¿à¦? (HTML5 à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾) à¦?à§?à¦²à¦¿à¦?-à¦?à§?-à¦?à§?à¦²à¦¾à¥¤
+securityLevel.custom.summary = à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¾à¦¸à§?à¦?à¦® à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§?à¦° à¦ªà¦?à¦¨à§?à¦¦à¦?à§?à¦²à¦¿à¦° à¦?à¦¾à¦°à¦£à§? à¦?à¦¸à§?à¦¬à¦¾à¦à¦¾à¦¬à¦¿à¦? à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦¸à§?à¦?à¦¿à¦?à¦¸ à¦¦à§?à¦?à¦¾ à¦¦à¦¿à¦¯à¦¼à§?à¦?à§? à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦?à¦¬à¦? à¦?à§?à¦ªà¦¨à§?à¦¯à¦¼à¦¤à¦¾à¦° à¦?à¦¾à¦°à¦£à§?, à¦?à¦®à¦°à¦¾ à¦?à¦ªà¦¨à¦¾à¦?à§? à¦¡à¦¿à¦«à¦²à§?à¦? à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦¸à§?à¦¤à¦°à¦?à§?à¦²à¦¿à¦° à¦?à¦?à¦?à¦¿ à¦?à¦¯à¦¼à¦¨ à¦?à¦°à¦¾à¦° à¦¸à§?à¦ªà¦¾à¦°à¦¿à¦¶ à¦?à¦°à¦¿à¥¤
+securityLevel.learnMore = à¦?à¦°à¦? à¦?à¦¾à¦¨à§?à¦¨
+securityLevel.restoreDefaults = à¦ªà§?à¦°à§?à¦¬à¦¨à¦¿à¦°à§?à¦§à¦¾à¦°à¦¨ à¦ªà§?à¦¨à¦°à§?à¦§à¦¾à¦°
diff --git a/src/chrome/locale/bn-BD/torbutton.dtd b/src/chrome/locale/bn-BD/torbutton.dtd
index 201f3111..449a49e3 100644
--- a/src/chrome/locale/bn-BD/torbutton.dtd
+++ b/src/chrome/locale/bn-BD/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "à¦?à¦? à¦¸à¦¾à¦?à¦?à§?à¦° à¦?à¦¨à§?à¦¯ à¦¨à¦¤à§?à¦¨ à¦?à¦° à¦¸à¦¾à¦°à§?à¦?à¦¿à¦?">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦¬à¦¿à¦¨à§?à¦¯à¦¾à¦¸â?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¸à§?à¦?à¦¿à¦?à¦¸ ...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦?à¦ªà¦¡à§?à¦?à§?à¦° à¦?à¦¨à§?à¦¯ à¦?à§?à¦? à¦?à¦°à§?à¦¨ ...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton à¦?à¦°à¦®à§?à¦ à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨">
 <!ENTITY torbutton.prefs.security_settings "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦¸à§?à¦?à¦¿à¦?à¦¸">
-<!ENTITY torbutton.prefs.restore_defaults "à¦ªà§?à¦°à§?à¦¬à¦¨à¦¿à¦°à§?à¦§à¦¾à¦°à¦¨ à¦ªà§?à¦¨à¦°à§?à¦§à¦¾à¦°">
-<!ENTITY torbutton.prefs.custom_warning "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¾à¦¸à§?à¦?à¦® à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§?à¦° à¦ªà¦?à¦¨à§?à¦¦à¦?à§?à¦²à¦¿à¦° à¦?à¦¾à¦°à¦£à§? à¦?à¦¸à§?à¦¬à¦¾à¦à¦¾à¦¬à¦¿à¦? à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦¸à§?à¦?à¦¿à¦?à¦¸ à¦¦à§?à¦?à¦¾ à¦¦à¦¿à¦¯à¦¼à§?à¦?à§? à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦?à¦¬à¦? à¦?à§?à¦ªà¦¨à§?à¦¯à¦¼à¦¤à¦¾à¦° à¦?à¦¾à¦°à¦£à§?, à¦?à¦®à¦°à¦¾ à¦?à¦ªà¦¨à¦¾à¦?à§? à¦¡à¦¿à¦«à¦²à§?à¦? à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦¸à§?à¦¤à¦°à¦?à§?à¦²à¦¿à¦° à¦?à¦?à¦?à¦¿ à¦?à¦¯à¦¼à¦¨ à¦?à¦°à¦¾à¦° à¦¸à§?à¦ªà¦¾à¦°à¦¿à¦¶ à¦?à¦°à¦¿à¥¤">
 <!ENTITY torbutton.cookiedialog.title "à¦?à§?à¦?à¦¿ à¦ªà§?à¦°à§?à¦?à§?à¦?à¦¶à¦¨à¦?à§?à¦²à¦¿ à¦ªà¦°à¦¿à¦?à¦¾à¦²à¦¨à¦¾ à¦?à¦°à§?à¦¨">
 <!ENTITY torbutton.cookiedialog.lockCol "à¦°à¦?à§?à¦·à¦¿à¦¤">
 <!ENTITY torbutton.cookiedialog.domainCol "à¦¨à¦¿à¦®à¦¨à§?à¦¤à§?à¦°à¦£à¦?à¦°à§?à¦¤à¦¾">
diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/bn-IN/torbutton.dtd
+++ b/src/chrome/locale/bn-IN/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/bn/torbutton.dtd
+++ b/src/chrome/locale/bn/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/br/torbutton.dtd
+++ b/src/chrome/locale/br/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/bs/securityLevel.properties b/src/chrome/locale/bs/securityLevel.properties
new file mode 100644
index 00000000..a713fa96
--- /dev/null
+++ b/src/chrome/locale/bs/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Vrati poÄ?etno
diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd
index 59167eb2..207f4312 100644
--- a/src/chrome/locale/bs/torbutton.dtd
+++ b/src/chrome/locale/bs/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tita kolaÄ?iÄ?a">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbutton-a">
-<!ENTITY torbutton.prefs.restore_defaults "Vrati poÄ?etno">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ca/securityLevel.properties b/src/chrome/locale/ca/securityLevel.properties
new file mode 100644
index 00000000..b17fba84
--- /dev/null
+++ b/src/chrome/locale/ca/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Nivell de seguretat
+securityLevel.standard.level = EstÃ ndard
+securityLevel.standard.summary = Totes les caracterÃstiques del buscador Tor i de la pÃ gina web estan actives.
+securityLevel.safer.level = MÃ©s segur.
+securityLevel.safer.summary = Desactivar les funcions del lloc web que sovint sÃ³n perilloses, pot fent que alguns llocs perden funcionalitat.
+securityLevel.safer.description1 = El JavaScript estÃ  desactivat per defecte en tots els llocs no-HTTPS
+securityLevel.safer.description2 = Algunes fonts i sÃmbols matemÃ tics estan desactivats.
+securityLevel.safer.description3 = L'Ã udio i el vÃdeo (mitjans de comunicaciÃ³ HTML5) sÃ³n click-to-play.
+securityLevel.safest.level = mÃ©s segur
+securityLevel.safest.summary = NomÃ©s es permeten funcions del lloc web requerides per a llocs estÃ tics i serveis bÃ sics. Aquests canvis afecten imatges, mitjans de comunicaciÃ³ i scripts.
+securityLevel.safest.description1 = El JavaScript estÃ  desactivat per defecte a tots els llocs.
+securityLevel.safest.description2 = Algunes fonts, icones, sÃmbols matemÃ tics, i imatges estan desactivats.
+securityLevel.safest.description3 = L'Ã udio i el vÃdeo (mitjans de comunicaciÃ³ HTML5) sÃ³n click-to-play.
+securityLevel.custom.summary = El navegador personalitzat ha obtingut uns parÃ metres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecciÃ³ d'un nivell de seguretat per defecte.
+securityLevel.learnMore = Apreneu-ne mÃ©s
+securityLevel.restoreDefaults = Torna a les opcions per defecte
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 0041973e..7537e1d7 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nou circuit Tor per a aquest lloc">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ParÃ metres de seguretat...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "PreferÃ¨ncies de la Xarxa Tor...7">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Cerca una actualitzaciÃ³ del navegador Tor...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton">
 <!ENTITY torbutton.prefs.security_settings "ParÃ metres de seguretat del navegador Tor">
-<!ENTITY torbutton.prefs.restore_defaults "Torna a les opcions per defecte">
-<!ENTITY torbutton.prefs.custom_warning "El navegador personalitzat ha obtingut uns parÃ metres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecciÃ³ d'un nivell de seguretat per defecte.">
 <!ENTITY torbutton.cookiedialog.title "Configura proteccions de les galetes">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegit">
 <!ENTITY torbutton.cookiedialog.domainCol "Allotjador">
diff --git a/src/chrome/locale/cs/securityLevel.properties b/src/chrome/locale/cs/securityLevel.properties
new file mode 100644
index 00000000..f9ab389a
--- /dev/null
+++ b/src/chrome/locale/cs/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Ã?roveÅ? zabezpeÄ?enÃ
+securityLevel.standard.level = StandardnÃ
+securityLevel.standard.summary = VÅ¡echny funkce prohlÃÅ¾eÄ?e Tor jsou zapnutÃ©.
+securityLevel.safer.level = BezpeÄ?nÄ?jÅ¡Ã
+securityLevel.safer.summary = NÄ?kterÃ© mÃ©nÄ? bezpeÄ?nÃ© funkce jsou vypnuty, ale nÄ?kterÃ© strÃ¡nky nemusÃ fungovat.
+securityLevel.safer.description1 = JavaScript je na strÃ¡nkÃ¡ch bez HTTPS vypnut.
+securityLevel.safer.description2 = NÄ?kterÃ¡ pÃsma a matematickÃ© symboly jsou zablokovÃ¡ny.
+securityLevel.safer.description3 = Audio a video (HTML5 mÃ©dia) se pÅ?ehrÃ¡vajÃ po kliknutÃ.
+securityLevel.safest.level = NejbezpeÄ?nÄ?jÅ¡Ã
+securityLevel.safest.summary = PovolÃ jen funkce pro zobrazenÃ statickÃ½ch webovÃ½ch strÃ¡nek a fungovÃ¡nÃ zÃ¡kladnÃch sluÅ¾eb. OvlivnÄ?no bude zobrazenÃ obrÃ¡zkÅ¯, mÃ©diÃ a fungovÃ¡nÃ skriptÅ¯.
+securityLevel.safest.description1 = JavaScript je ve vÃ½chozÃm nastavenÃ vypnut na vÅ¡ech strÃ¡nkÃ¡ch.
+securityLevel.safest.description2 = NÄ?kterÃ¡ pÃsma, matematickÃ© symboly a obrÃ¡zky jsou zablokovÃ¡ny.
+securityLevel.safest.description3 = Audio a video (HTML5 mÃ©dia) se pÅ?ehrÃ¡vajÃ po kliknutÃ.
+securityLevel.custom.summary = VaÅ¡e nastavenÃ prohlÃÅ¾eÄ?e neodpovÃdÃ¡ standardnÃmu nastavenÃ zabezpeÄ?enÃ. Z dÅ¯vodu ochrany soukromÃ a zvÃ½Å¡enÃ bezpeÄ?nosti vÃ¡m doporuÄ?ujeme vybrat si jednu z vÃ½chozÃch bezpeÄ?nostnÃch ÃºrovnÃ.
+securityLevel.learnMore = Zjistit vÃce
+securityLevel.restoreDefaults = Obnovit vÃ½chozÃ
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 239dbc2f..1a4feeed 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "i">
 <!ENTITY torbutton.context_menu.new_circuit "NovÃ½ okruh Toru pro tuto strÃ¡nku">
 <!ENTITY torbutton.context_menu.new_circuit_key "o">
-<!ENTITY torbutton.context_menu.preferences "NastavenÃ zabezpeÄ?enÃâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "b">
 <!ENTITY torbutton.context_menu.networksettings "NastavenÃ sÃtÄ? Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Vyhledat aktualizace prohlÃÅ¾eÄ?e Torâ?¦">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "c">
 <!ENTITY torbutton.button.tooltip "KlepnÄ?te pro inicializaci Torbutton">
 <!ENTITY torbutton.prefs.security_settings "NastavenÃ zabezpeÄ?enÃ prohlÃÅ¾eÄ?e Tor">
-<!ENTITY torbutton.prefs.restore_defaults "Obnovit vÃ½chozÃ">
-<!ENTITY torbutton.prefs.custom_warning "VaÅ¡e nastavenÃ prohlÃÅ¾eÄ?e neodpovÃdÃ¡ standardnÃmu nastavenÃ zabezpeÄ?enÃ. Z dÅ¯vodu ochrany soukromÃ a zvÃ½Å¡enÃ bezpeÄ?nosti vÃ¡m doporuÄ?ujeme vybrat si jednu z vÃ½chozÃch bezpeÄ?nostnÃch ÃºrovnÃ.">
 <!ENTITY torbutton.cookiedialog.title "SprÃ¡va ochrany cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "ChrÃ¡nÄ?nÃ©">
 <!ENTITY torbutton.cookiedialog.domainCol "Server">
diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/csb/torbutton.dtd
+++ b/src/chrome/locale/csb/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd
index 84b229b1..507d6960 100644
--- a/src/chrome/locale/cy/torbutton.dtd
+++ b/src/chrome/locale/cy/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Cliciwch i ymgychwyn Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/da/securityLevel.properties b/src/chrome/locale/da/securityLevel.properties
new file mode 100644
index 00000000..8f18cc57
--- /dev/null
+++ b/src/chrome/locale/da/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Sikkerhedsniveau
+securityLevel.standard.level = Standard
+securityLevel.standard.summary = Alle Tor Browser- og webstedsfunktionaliteter er aktiveret.
+securityLevel.safer.level = Mere sikker
+securityLevel.safer.summary = Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gÃ¸re at nogle steder mister deres funktionalitet.
+securityLevel.safer.description1 = JavaScript er deaktiveret pÃ¥ ikke-HTTPS steder.
+securityLevel.safer.description2 = Nogle skrifttyper og matematiksymboler er deaktiverede.
+securityLevel.safer.description3 = Lyd og video (HTML5-medier) er klik-for-at-afspille.
+securityLevel.safest.level = Mest sikker
+securityLevel.safest.summary = Tillader kun webstedsfunktionaliteter som krÃ¦ves til statiske steder og grundlÃ¦ggende tjenester. Ã?ndringerne pÃ¥virker billeder, medier og scripts.
+securityLevel.safest.description1 = JavaScript er som standard deaktiveret pÃ¥ alle steder.
+securityLevel.safest.description2 = Nogle skrifttyper, ikoner, matematiksymboler og billeder er deaktiveret.
+securityLevel.safest.description3 = Lyd og video (HTML5-medier) er klik-for-at-afspille.
+securityLevel.custom.summary = Dine tilpassede browserprÃ¦ferencer har resulterede i usÃ¦dvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsÃ¥rsagen, anbefaler vi at du vÃ¦lger en af standardsikkerhedsniveauerne.
+securityLevel.learnMore = LÃ¦r mere
+securityLevel.restoreDefaults = Gendan Standarder
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index e32001d1..4fa64baa 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nyt Tor-kredslÃ¸b for dette sted">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Sikkerhedsindstillingerâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor-netvÃ¦rksindstillinger...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "SÃ¸g efter opdateringer til Tor Browser...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Tor Browser-sikkerhedsindstillinger">
-<!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder">
-<!ENTITY torbutton.prefs.custom_warning "Dine tilpassede browserprÃ¦ferencer har resulterede i usÃ¦dvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsÃ¥rsagen, anbefaler vi at du vÃ¦lger en af standardsikkerhedsniveauerne.">
 <!ENTITY torbutton.cookiedialog.title "HÃ¥ndtÃ©r Cookie-beskyttelser">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "VÃ¦rt">
diff --git a/src/chrome/locale/de/securityLevel.properties b/src/chrome/locale/de/securityLevel.properties
new file mode 100644
index 00000000..871f8378
--- /dev/null
+++ b/src/chrome/locale/de/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Sicherheitsstufe
+securityLevel.standard.level = Standard
+securityLevel.standard.summary = Alle Tor Browser und Webseiten Funktionen sind aktiviert.
+securityLevel.safer.level = Sicherer
+securityLevel.safer.summary = Deaktiviert Webseiten-Funktionen, die oft gefÃ¤hrlich sind. Sorgt dafÃ¼r, dass manche Seiten nicht mehr so gut funktionieren
+securityLevel.safer.description1 = JavaScript ist auf Nicht-HTTTPS-Sites deaktiviert.
+securityLevel.safer.description2 = Einige Schriftarten und mathematische Symbole sind deaktiviert.
+securityLevel.safer.description3 = Audio und Video (HTML5-Medien) mÃ¼ssen zur Wiedergabe angeklickt werden.
+securityLevel.safest.level = Am sichersten
+securityLevel.safest.summary = Erlaubt nur Webseiten-Funktionen, die fÃ¼r statische Seiten und Basisdienste benÃ¶tigt werden. Diese Ã?nderungen betreffen Bilder, Medien und Skripte.
+securityLevel.safest.description1 = JavaScript ist standardmÃ¤Ã?ig auf allen Seiten deaktiviert.
+securityLevel.safest.description2 = Einige Schriftarten, Symbole, mathematische Symbole und Bilder sind deaktiviert.
+securityLevel.safest.description3 = Audio und Video (HTML5-Medien) mÃ¼ssen zur Wiedergabe angeklickt werden.
+securityLevel.custom.summary = Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewÃ¶hnlichen Sicherheitseinstellungen gefÃ¼hrt. Aus GrÃ¼nden der Sicherheit und PrivatsphÃ¤re empfehlen wir dir eine der vorgegebenen Sicherheitsstufen auszuwÃ¤hlen.
+securityLevel.learnMore = Erfahre mehr
+securityLevel.restoreDefaults = Standardeinstellungen wiederherstellen
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index d155a4ef..1846ff51 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal fÃ¼r diese Seite">
 <!ENTITY torbutton.context_menu.new_circuit_key "K">
-<!ENTITY torbutton.context_menu.preferences "Sicherheitseinstellungen â?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor-Netzwerk-Einstellungen â?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Auf Tor-Browser-Aktualisierungen prÃ¼fen â?¦">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
 <!ENTITY torbutton.prefs.security_settings "Tor-Browser-Sicherheitseinstellungen">
-<!ENTITY torbutton.prefs.restore_defaults "Standardeinstellungen wiederherstellen">
-<!ENTITY torbutton.prefs.custom_warning "Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewÃ¶hnlichen Sicherheitseinstellungen gefÃ¼hrt. Aus GrÃ¼nden der Sicherheit und PrivatsphÃ¤re empfehlen wir dir eine der vorgegebenen Sicherheitsstufen auszuwÃ¤hlen.">
 <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten">
 <!ENTITY torbutton.cookiedialog.lockCol "GeschÃ¼tzt">
 <!ENTITY torbutton.cookiedialog.domainCol "Rechner">
@@ -27,8 +23,7 @@
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schÃ¼tzen">
 <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler kannst du bestimmte Browserfunktionen, die deinen Browser fÃ¼r mÃ¶gliche Attacken anfÃ¤lliger machen, deaktivieren.">
-<!ENTITY torbutton.prefs.sec_standard_label "Standard
-">
+<!ENTITY torbutton.prefs.sec_standard_label "Standard">
 <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser und Webseiten Funktionen sind aktiviert.">
 <!ENTITY torbutton.prefs.sec_safer_label "Sicherer">
 <!ENTITY torbutton.prefs.sec_safer_description "Deaktiviert Webseiten-Funktionen, die oft gefÃ¤hrlich sind. Sorgt dafÃ¼r, dass manche Seiten nicht mehr so gut funktionieren">
diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/dz/torbutton.dtd
+++ b/src/chrome/locale/dz/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/el/securityLevel.properties b/src/chrome/locale/el/securityLevel.properties
new file mode 100644
index 00000000..722678df
--- /dev/null
+++ b/src/chrome/locale/el/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Î?Ï?Î¯Ï?ÎµÎ´Î¿ Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?
+securityLevel.standard.level = Î?Î±Ï?Î¹ÎºÏ?
+securityLevel.standard.summary = Î?Î»ÎµÏ? Î¿Î¹ Ï?Î±Ï?Î¿Ï?ÎÏ? Ï?Î¿Ï? Ï?ÎµÏ?Î¹Î·Î³Î·Ï?Î® Tor ÎºÎ±Î¹ Ï?Î·Ï? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î±Ï? ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½ÎµÏ?.
+securityLevel.safer.level = Î?Ï?Ï?Î±Î»ÎÏ?Ï?ÎµÏ?Î¿
+securityLevel.safer.summary = Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹ÎµÎ¯ Ï?Î±Ï?Î¿Ï?ÎÏ? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Ï?Î½ Ï?Î¿Ï? ÎµÎ¯Î½Î±Î¹ ÎµÏ?Î¹ÎºÎ¯Î½Î´Ï?Î½ÎµÏ? ÎºÎ±Î¹ Î¿Î´Î·Î³Î¿Ï?Î½ ÎºÎ¬Ï?Î¿Î¹ÎµÏ? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ? Ï?Ï?Î¿ Î½Î± Ï?Î¬Î½Î¿Ï?Î½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¹ÎºÏ?Ï?Î·Ï?Î±.
+securityLevel.safer.description1 = Î? JavaScript ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î· Ï?Îµ Î¹Ï?Ï?Ï?Ï?Î¿Ï?Î¿Ï?Ï? Ï?Î¿Ï? Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ HTTPS.
+securityLevel.safer.description2 = Î?ÎµÏ?Î¹ÎºÎÏ? Î³Ï?Î±Î¼Î¼Î±Ï?Î¿Ï?ÎµÎ¹Ï?ÎÏ? ÎºÎ±Î¹ Î¼Î±Î¸Î·Î¼Î±Ï?Î¹ÎºÎ¬ Ï?Ï?Î¼Î²Î¿Î»Î± ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î±.
+securityLevel.safer.description3 = Î?Î¹ Î®Ï?Î¿Î¹ ÎºÎ±Î¹ Ï?Î± Î²Î¯Î½Ï?ÎµÎ¿ (Î¼ÎÏ?Î± HTML5) Ï?Î±Î¯Î¶Î¿Ï?Î½, Î±Ï?Î¿Ï? Î³Î¯Î½ÎµÎ¹ ÎºÎ»Î¹Îº Î³Î¹Î± Î±Î½Î±Ï?Î±Ï?Î±Î³Ï?Î³Î®.
+securityLevel.safest.level = Î?Ï?Ï?Î±Î»ÎÏ?Ï?Î±Ï?Î¿
+securityLevel.safest.summary = Î?Ï?Î¹Ï?Ï?ÎÏ?ÎµÎ¹ Î¼Ï?Î½Î¿ Ï?Î¹Ï? Ï?Î±Ï?Î¿Ï?ÎÏ? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î±Ï? Ï?Î¿Ï? Î±Ï?Î±Î¹Ï?Î¿Ï?Î½Ï?Î±Î¹ Î³Î¹Î± Î²Î±Ï?Î¹ÎºÎÏ? Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ? ÎºÎ±Î¹ Ï?Ï?Î·Ï?ÎµÏ?Î¯ÎµÏ?. Î?Ï?Ï?Ï? ÎµÏ?Î·Ï?ÎµÎ¬Î¶ÎµÎ¹ ÎµÎ¹ÎºÏ?Î½ÎµÏ?, Î¼ÎÏ?Î± ÎºÎ±Î¹ scripts.
+securityLevel.safest.description1 = Î? JavaScript ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î· Ï?Îµ Ï?Î»Î¿Ï?Ï? Ï?Î¿Ï?Ï? Î¹Ï?Ï?Ï?Ï?Î¿Ï?Î¿Ï?Ï? Ï?Ï? Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Î®.
+securityLevel.safest.description2 = Î?Ï?Î¹Ï?Î¼ÎÎ½ÎµÏ? Î³Ï?Î±Î¼Î¼Î±Ï?Î¿Ï?ÎµÎ¹Ï?ÎÏ?, ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î±, Î¼Î±Î¸Î·Î¼Î±Ï?Î¹ÎºÎ¬ Ï?Ï?Î¼Î²Î¿Î»Î± ÎºÎ±Î¹ ÎµÎ¹ÎºÏ?Î½ÎµÏ? ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î±.
+securityLevel.safest.description3 = Î?Î¹ Î®Ï?Î¿Î¹ ÎºÎ±Î¹ Ï?Î± Î²Î¯Î½Ï?ÎµÎ¿ (Î¼ÎÏ?Î± HTML5) Ï?Î±Î¯Î¶Î¿Ï?Î½, Î±Ï?Î¿Ï? Î³Î¯Î½ÎµÎ¹ ÎºÎ»Î¹Îº Î³Î¹Î± Î±Î½Î±Ï?Î±Ï?Î±Î³Ï?Î³Î®.
+securityLevel.custom.summary = Î?Î¹ Ï?Ï?Î¿Ï?Î±Ï?Î¼Î¿Ï?Î¼ÎÎ½ÎµÏ? Ï?Ï?Î¿Ï?Î¹Î¼Î®Ï?ÎµÎ¹Ï? Ï?Î¿Ï? browser Ï?Î±Ï? ÎÏ?Î¿Ï?Î½ Î¿Î´Î·Î³Î®Ï?ÎµÎ¹ Ï?Îµ Î±Ï?Ï?Î½Î®Î¸Î¹Ï?Ï?ÎµÏ? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?. Î?Î¹Î± Î»Ï?Î³Î¿Ï?Ï? Î±Ï?Ï?Î±Î»ÎµÎ¯Î±Ï? ÎºÎ±Î¹ Î¹Î´Î¹Ï?Ï?Î¹ÎºÏ?Ï?Î·Ï?Î±Ï?, Ï?Ï?Î¿Ï?ÎµÎ¯Î½Î¿Ï?Î¼Îµ Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ ÎÎ½Î± Î±Ï?Ï? Ï?Î± Ï?Ï?Î¿ÎµÏ?Î¹Î»ÎµÎ³Î¼ÎÎ½Î± ÎµÏ?Î¯Ï?ÎµÎ´Î± Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?.
+securityLevel.learnMore = Î?Î¬Î¸ÎµÏ?Îµ Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÏ?Î±
+securityLevel.restoreDefaults = Î?Ï?Î±Î½Î±Ï?Î¿Ï?Î¬ Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Ï?Î½
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 63d7597a..4f474387 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Î?ÎÎ¿ ÎºÏ?ÎºÎ»Ï?Î¼Î± Tor Î³Î¹Î± Î±Ï?Ï?Î®Î½ Ï?Î·Î½ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î±">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î?Ï?Ï?Î±Î»ÎµÎ¯Î±Ï?...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Î¿Ï? Î?Î¹ÎºÏ?Ï?Î¿Ï? Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Î?Î»ÎµÎ³Ï?Î¿Ï? Î³Î¹Î± ÎµÎ½Î·Î¼ÎÏ?Ï?Ï?Î· Ï?Î¿Ï? Tor Browser...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î½Î± ÎµÎºÎºÎ¹Î½Î®Ï?ÎµÏ?Îµ Ï?Î¿ Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î±Ï?Ï?Î±Î»ÎµÎ¯Î±Ï? Ï?Î¿Ï? Tor Browser">
-<!ENTITY torbutton.prefs.restore_defaults "Î?Ï?Î±Î½Î±Ï?Î¿Ï?Î¬ Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Ï?Î½">
-<!ENTITY torbutton.prefs.custom_warning "Î?Î¹ Ï?Ï?Î¿Ï?Î±Ï?Î¼Î¿Ï?Î¼ÎÎ½ÎµÏ? Ï?Ï?Î¿Ï?Î¹Î¼Î®Ï?ÎµÎ¹Ï? Ï?Î¿Ï? browser Ï?Î±Ï? ÎÏ?Î¿Ï?Î½ Î¿Î´Î·Î³Î®Ï?ÎµÎ¹ Ï?Îµ Î±Ï?Ï?Î½Î®Î¸Î¹Ï?Ï?ÎµÏ? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?. Î?Î¹Î± Î»Ï?Î³Î¿Ï?Ï? Î±Ï?Ï?Î±Î»ÎµÎ¯Î±Ï? ÎºÎ±Î¹ Î¹Î´Î¹Ï?Ï?Î¹ÎºÏ?Ï?Î·Ï?Î±Ï?, Ï?Ï?Î¿Ï?ÎµÎ¯Î½Î¿Ï?Î¼Îµ Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ ÎÎ½Î± Î±Ï?Ï? Ï?Î± Ï?Ï?Î¿ÎµÏ?Î¹Î»ÎµÎ³Î¼ÎÎ½Î± ÎµÏ?Î¯Ï?ÎµÎ´Î± Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?.">
 <!ENTITY torbutton.cookiedialog.title "Î?Î¹Î±Ï?ÎµÎ¯Ï?Î¹Ï?Î· Î Ï?Î¿Ï?Ï?Î±Ï?Î¯Î±Ï? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Î Ï?Î¿Ï?Ï?Î±Ï?ÎµÏ?Î¼ÎÎ½Î±">
 <!ENTITY torbutton.cookiedialog.domainCol "Î?Î¹ÎºÎ¿Î´ÎµÏ?Ï?Ï?Ï?Î·Ï?">
diff --git a/src/chrome/locale/en-US/securityLevel.properties b/src/chrome/locale/en-US/securityLevel.properties
new file mode 100644
index 00000000..6ccbb033
--- /dev/null
+++ b/src/chrome/locale/en-US/securityLevel.properties
@@ -0,0 +1,22 @@
+securityLevel.securityLevel = Security Level
+securityLevel.customWarning = Custom
+securityLevel.overview = Disable certain web features that can be used to attack your security and anonymity.
+securityLevel.standard.level = Standard
+securityLevel.standard.tooltip = Security Level : Standard
+securityLevel.standard.summary = All Tor Browser and website features are enabled.
+securityLevel.safer.level = Safer
+securityLevel.safer.tooltip = Security Level : Safer
+securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality.
+securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites.
+securityLevel.safer.description2 = Some fonts and math symbols are disabled.
+securityLevel.safer.description3 = Audio and video (HTML5 media) are click-to-play.
+securityLevel.safest.level = Safest
+securityLevel.safest.tooltip = Security Level : Safest
+securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.
+securityLevel.safest.description1 = JavaScript is disabled by default on all sites.
+securityLevel.safest.description2 = Some fonts, icons, math symbols, and images are disabled.
+securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-play.
+securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.
+securityLevel.learnMore = Learn more
+securityLevel.restoreDefaults = Restore Defaults
+securityLevel.advancedSecuritySettings = Advanced Security Settingsâ?¦
\ No newline at end of file
diff --git a/src/chrome/locale/en-US/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd
index 1a299af9..83b1ffb5 100644
--- a/src/chrome/locale/en-US/torbutton.dtd
+++ b/src/chrome/locale/en-US/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/eo/securityLevel.properties b/src/chrome/locale/eo/securityLevel.properties
new file mode 100644
index 00000000..aa80f5cb
--- /dev/null
+++ b/src/chrome/locale/eo/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = RestaÅri defaÅltojn
diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd
index 8dd75e5c..a4c2f3ab 100644
--- a/src/chrome/locale/eo/torbutton.dtd
+++ b/src/chrome/locale/eo/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "RestaÅri defaÅltojn">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/es-AR/securityLevel.properties b/src/chrome/locale/es-AR/securityLevel.properties
new file mode 100644
index 00000000..ae089179
--- /dev/null
+++ b/src/chrome/locale/es-AR/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Nivel de seguridad
+securityLevel.standard.level = EstÃ¡ndar
+securityLevel.standard.summary = Todas las caracterÃsticas del navegador Tor y el sitio web estÃ¡n habilitadas.
+securityLevel.safer.level = MÃ¡s seguro
+securityLevel.safer.summary = Deshabilita caracterÃsticas del sitio web que son a menudo peligrosas, causando que algunos sitios pierdan funcionalidad.
+securityLevel.safer.description1 = JavaScript estÃ¡ deshabilitado en sitios no-HTTPS.
+securityLevel.safer.description2 = Algunos tipos de letra y sÃmbolos matemÃ¡ticos estÃ¡n deshabilitados.
+securityLevel.safer.description3 = Audio y video (medios HTML5) son cliquear-para-reproducir.
+securityLevel.safest.level = En extremo seguro
+securityLevel.safest.summary = SÃ³lo permite caracterÃsticas del sitio web requeridas por sitios estÃ¡ticos y servicios bÃ¡sicos. Estos cambios afectan imÃ¡genes, medios y cÃ³digo ejecutable.
+securityLevel.safest.description1 = JavaScript estÃ¡ deshabilitado por defecto en todos los sitios.
+securityLevel.safest.description2 = Algunos tipos de letra, iconos, sÃmbolos matemÃ¡ticos e imÃ¡genes estÃ¡n deshabilitados.
+securityLevel.safest.description3 = Audio y video (medios HTML5) son cliquear-para-reproducir.
+securityLevel.custom.summary = Tus preferencias personalizadas del navegador han resultado en ajustes de seguridad inusuales. Por razones de seguridad y privacidad, recomendamos que elijas uno de los niveles de seguridad por defecto.
+securityLevel.learnMore = MÃ¡s informacion
+securityLevel.restoreDefaults = Restablecer valores por defecto
diff --git a/src/chrome/locale/es-AR/torbutton.dtd b/src/chrome/locale/es-AR/torbutton.dtd
index d58dfb56..3d2315af 100644
--- a/src/chrome/locale/es-AR/torbutton.dtd
+++ b/src/chrome/locale/es-AR/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nuevo Circuito Tor para este Sitio">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ConfiguraciÃ³n de Seguridad...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Configuraciones de la Red de Tor">
 <!ENTITY torbutton.context_menu.networksettings.key "R">
 <!ENTITY torbutton.context_menu.downloadUpdate "Comprobar si hay ActualizaciÃ³n para el Navegador Tor">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "K">
 <!ENTITY torbutton.button.tooltip "CliqueÃ¡ para inicializar Torbutton">
 <!ENTITY torbutton.prefs.security_settings "ConfiguraciÃ³n de Seguridad del Navegador Tor">
-<!ENTITY torbutton.prefs.restore_defaults "Restablecer valores por defecto">
-<!ENTITY torbutton.prefs.custom_warning "Tus preferencias personalizadas del navegador han resultado en ajustes de seguridad inusuales. Por razones de seguridad y privacidad, recomendamos que elijas uno de los niveles de seguridad por defecto.">
 <!ENTITY torbutton.cookiedialog.title "Manejar la ProtecciÃ³n de cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/es/securityLevel.properties b/src/chrome/locale/es/securityLevel.properties
new file mode 100644
index 00000000..2aebcdbf
--- /dev/null
+++ b/src/chrome/locale/es/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Nivel de seguridad
+securityLevel.standard.level = EstÃ¡ndar
+securityLevel.standard.summary = EstÃ¡n habilitadas todas las caracterÃsticas de Tor Browser y sitio web.
+securityLevel.safer.level = MÃ¡s segura
+securityLevel.safer.summary = Deshabilita caracterÃsticas del sitio web que a menudo son peligrosas, lo que causa que algunos sitios pierdan funcionalidad.
+securityLevel.safer.description1 = JavaScript estÃ¡ deshabilitado en sitios no-HTTPS.
+securityLevel.safer.description2 = Algunas fuentes y sÃmbolos matemÃ¡ticos estÃ¡n deshabilitados.
+securityLevel.safer.description3 = Audio y vÃdeo (medios HTML5) son de tipo pulsar-para-reproducir.
+securityLevel.safest.level = La mÃ¡s segura
+securityLevel.safest.summary = SÃ³lo permite las caracterÃsticas de sitio web requeridas para sitios estÃ¡ticos y servicios bÃ¡sicos. Estos cambios afectan a imÃ¡genes, medios, y scripts.
+securityLevel.safest.description1 = JavaScript estÃ¡ deshabilitado por defecto en todos los sitios.
+securityLevel.safest.description2 = Algunas fuentes, iconos, sÃmbolos matemÃ¡ticos, e imÃ¡genes estÃ¡n deshabilitados.
+securityLevel.safest.description3 = Audio y vÃdeo (medios HTML5) son de tipo pulsar-para-reproducir.
+securityLevel.custom.summary = Tus preferencias personalizadas para el navegador han resultado en una configuraciÃ³n de seguridad inusual. Por motivos de seguridad y privacidad, te recomendamos uno de los de los niveles de seguridad predeterminados.
+securityLevel.learnMore = Conocer mÃ¡s
+securityLevel.restoreDefaults = Restaurar valores predeterminados
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 3a6c636a..a44dfc6f 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este sitio">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ConfiguraciÃ³n de seguridad...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ConfiguraciÃ³n de red Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "R">
 <!ENTITY torbutton.context_menu.downloadUpdate "Comprobar actualizaciÃ³n del Tor Browser...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton">
 <!ENTITY torbutton.prefs.security_settings "ConfiguraciÃ³n de seguridad del Tor Browser">
-<!ENTITY torbutton.prefs.restore_defaults "Restaurar valores predeterminados">
-<!ENTITY torbutton.prefs.custom_warning "Tus preferencias personalizadas para el navegador han resultado en una configuraciÃ³n de seguridad inusual. Por motivos de seguridad y privacidad, te recomendamos uno de los de los niveles de seguridad predeterminados.">
 <!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegidas">
 <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)">
diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/et/torbutton.dtd
+++ b/src/chrome/locale/et/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/eu/securityLevel.properties b/src/chrome/locale/eu/securityLevel.properties
new file mode 100644
index 00000000..bd9dfc0d
--- /dev/null
+++ b/src/chrome/locale/eu/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Segurtasun maila
+securityLevel.standard.level = Estandarra
+securityLevel.standard.summary = Tor Nabigatzailearen eta web-orriaren ezaugarri guztiak gaituta daude.
+securityLevel.safer.level = Seguruagoa
+securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality.
+securityLevel.safer.description1 = JavaScript ezgaituta dago HTTPS ez diren web-orrietan.
+securityLevel.safer.description2 = Some fonts and math symbols are disabled.
+securityLevel.safer.description3 = Audio and video (HTML5 media) are click-to-play.
+securityLevel.safest.level = Seguruena
+securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.
+securityLevel.safest.description1 = JavaScript is disabled by default on all sites.
+securityLevel.safest.description2 = Some fonts, icons, math symbols, and images are disabled.
+securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-play.
+securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.
+securityLevel.learnMore = Gehiago jakin
+securityLevel.restoreDefaults = Lehenetsiak berrezarri
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index ca42906b..18b0bb8f 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Segurtasun Ezarpenak...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor Sarearen Ezarpenak...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser eguneraketa egiaztatu">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko">
 <!ENTITY torbutton.prefs.security_settings "Tor Nagibatzailearen Segurtasun Ezarpenak">
-<!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri">
-<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
 <!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu">
 <!ENTITY torbutton.cookiedialog.lockCol "Babestuta">
 <!ENTITY torbutton.cookiedialog.domainCol "Ostalaria">
diff --git a/src/chrome/locale/fa/securityLevel.properties b/src/chrome/locale/fa/securityLevel.properties
new file mode 100644
index 00000000..9336f836
--- /dev/null
+++ b/src/chrome/locale/fa/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Ø³Ø·Ø Ø§Ù?Ù?Û?Øª
+securityLevel.standard.level = Ø§Ø³ØªØ§Ù?Ø¯Ø§Ø±Ø¯
+securityLevel.standard.summary = Ù?Ù?Ù? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ù? Ù?Û?Ú?Ú¯Û?â??Ù?Ø§Û? Ù?Ø¨Ø³Ø§Û?Øª Ø¨Ù? Ú©Ø§Ø± Ø§Ù?Ø¯Ø§Ø®ØªÙ? Ø´Ø¯Ù?â??Ø§Ù?Ø¯.
+securityLevel.safer.level = Ø§Û?Ù?Ù? ØªØ±
+securityLevel.safer.summary = Ø§Ø² Ú©Ø§Ø± Ø§Ù?Ø¯Ø§Ø®ØªÙ? Ù?Û?Ú?Ú¯Û?â??Ù?Ø§Û? Ù?Ø¨Ø³Ø§Û?Øª Ú©Ù? Ø§ØºÙ?Ø¨ Ø®Ø·Ø±Ù?Ø§Ú© Ù?Ø³ØªÙ?Ø¯ Ù? Ø¨Ø§Ø¹Ø« Ø§Ø² Ø¯Ø³Øª Ø±Ù?ØªÙ? Ø¨Ø±Ø®Û? Ø³Ø§Û?Øªâ??Ù?Ø§ Ù?Û?â??Ø´Ù?Ù?Ø¯.
+securityLevel.safer.description1 = Ø¬Ø§Ù?Ø§ Ø§Ø³Ú©Ø±Û?Ù¾Øª Ø±Ù?Û? Ø³Ø§Û?Øªâ??Ù?Ø§Û? ØºÛ?Ø± HTTPS Ú©Ø§Ø± Ù?Ù?Û?â??Ú©Ù?Ø¯.
+securityLevel.safer.description2 = Ø¨Ø±Ø®Û? Ø§Ø² Ù?Ù?Ù?Øª Ù?Ø§ Ù? Ù?Ù?Ø§Ø¯Ù?Ø§Û? Ø±Û?Ø§Ø¶Û? ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ù?Ø³ØªÙ?Ø¯
+securityLevel.safer.description3 = ØµØ¯Ø§ Ù? Ù?Û?Ø¯Û?Ù? ( HTML5 Ø±Ø³Ø§Ù?Ù? ) Ø¨Ø±Ø§Û? Ø¨Ø§Ø²Û? Ú©Ù?Û?Ú© Ù?Û?â??Ú©Ù?Ù?Ø¯.
+securityLevel.safest.level = Ø§Û?Ù?Ù? ØªØ±Û?Ù?
+securityLevel.safest.summary = ØªÙ?Ù?Ø§ Ø§Ø¬Ø§Ø²Ù? Ù?Û?â??Ø¯Ù?Ø¯ Ú©Ù? Ù?Û?Ú?Ú¯Û?â??Ù?Ø§Û? Ù?Ø¨Ø³Ø§Û?Øª Ø¨Ø±Ø§Û? Ø³Ø§Û?Øªâ??Ù?Ø§Û? Ø§Û?Ø³ØªØ§ Ù? Ø®Ø¯Ù?Ø§Øª Ù¾Ø§Û?Ù? Ù?Ù?Ø±Ø¯ Ù?Û?Ø§Ø² Ø¨Ø§Ø´Ø¯. Ø§Û?Ù? ØªØºÛ?Û?Ø±Ø§Øª Ø¨Ø± ØªØµØ§Ù?Û?Ø±Ø? Ø±Ø³Ø§Ù?Ù?â??Ù?Ø§ Ù? Ù?ØªÙ? ØªØ§Ø«Û?Ø± Ù?Û?â??Ú¯Ø°Ø§Ø±Ù?Ø¯.
+securityLevel.safest.description1 = Ø¬Ø§Ù?Ø§ Ø§Ø³Ú©Ø±Û?Ù¾Øª Ø¨Ù? Ø·Ù?Ø± Ù¾Û?Ø´ Ù?Ø±Ø¶ Ø¯Ø± ØªÙ?Ø§Ù?Û? Ø³Ø§Û?Øª Ù?Ø§ ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ø§Ø³Øª.
+securityLevel.safest.description2 = Ø¨Ø±Ø®Û? Ø§Ø² Ù?Ù?Ù?Øª Ù?Ø§Ø? Ø´Ù?Ø§Û?Ù?â??Ù?Ø§Ø? Ø¹Ù?Ø§Û?Ù? Ø±Û?Ø§Ø¶Û? Ù? ØªØµØ§Ù?Û?Ø± Ø§Ø² Ú©Ø§Ø± Ø§Ù?ØªØ§Ø¯Ù? Ù?Ø³ØªÙ?Ø¯.
+securityLevel.safest.description3 = ØµØ¯Ø§ Ù? Ù?Û?Ø¯Û?Ù? ( HTML5 Ø±Ø³Ø§Ù?Ù? ) Ø¨Ø±Ø§Û? Ø¨Ø§Ø²Û? Ú©Ù?Û?Ú© Ù?Û?â??Ú©Ù?Ù?Ø¯.
+securityLevel.custom.summary = ØªÙ?Ø¸Û?Ù?Ø§Øª Ø³Ù?Ø§Ø±Ø´Û? Ø´Ù?Ø§ Ø¯Ø± Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ù?Ø¬Ø± Ø¨Ù? ØªØºÛ?Û?Ø±Ø§Øª ØºÛ?Ø± Ù?Ø¹Ù?Ù?Ù? Ø¯Ø± ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù?Û?ØªÛ? Ø´Ø¯Ù? Ø§Ø³Øª.Ø¨Ø±Ø§Û? Ø§Ù?Ù? Ù?Ú¯Ù? Ø¯Ø§Ø´ØªÙ? ØØ±Û?Ù? Ø®ØµÙ?ØµÛ? Ø®Ù?Ø¯ Ù?Ø§ Ù¾Û?Ø´Ù?Ù?Ø§Ø¯ Ù?Û?Ú©Ù?Û?Ù? Û?Ú©Û? Ø§Ø² ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Û?Ø´Ù?Ø±Ø¶ Ø§Ù?Ù?Û?ØªÛ? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯.
+securityLevel.learnMore = Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±
+securityLevel.restoreDefaults = Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù?Û? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù?Û?Ù?
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 49385ee1..b748951f 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ø´Ø¨Ú©Ù? Ø¬Ø¯Û?Ø¯ Tor Ø¨Ø±Ø§Û? Ø§Û?Ù? Ø³Ø§Û?Øª">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù?Û?ØªÛ?â?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ø¨Ø±Ø±Ø³Û? Ø¨Ø±Ù?Ø² Ø±Ø³Ø§Ù?Û? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ø¬Ù?Øª Ø´Ø±Ù?Ø¹ Ø¯Ù?Ù?Ù? ØªÙ?Ø±Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯">
 <!ENTITY torbutton.prefs.security_settings "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù?Û?ØªÛ? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.restore_defaults "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù?Û? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù?Û?Ù?">
-<!ENTITY torbutton.prefs.custom_warning "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø³Ù?Ø§Ø±Ø´Û? Ø´Ù?Ø§ Ø¯Ø± Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ù?Ø¬Ø± Ø¨Ù? ØªØºÛ?Û?Ø±Ø§Øª ØºÛ?Ø± Ù?Ø¹Ù?Ù?Ù? Ø¯Ø± ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù?Û?ØªÛ? Ø´Ø¯Ù? Ø§Ø³Øª.Ø¨Ø±Ø§Û? Ø§Ù?Ù? Ù?Ú¯Ù? Ø¯Ø§Ø´ØªÙ? ØØ±Û?Ù? Ø®ØµÙ?ØµÛ? Ø®Ù?Ø¯ Ù?Ø§ Ù¾Û?Ø´Ù?Ù?Ø§Ø¯ Ù?Û?Ú©Ù?Û?Ù? Û?Ú©Û? Ø§Ø² ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Û?Ø´Ù?Ø±Ø¶ Ø§Ù?Ù?Û?ØªÛ? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯. ">
 <!ENTITY torbutton.cookiedialog.title "Ù?Ø¯Ù?Ø±Ù?Øª ØÙ?Ø§Ø¸Øª Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§">
 <!ENTITY torbutton.cookiedialog.lockCol "ØÙ?Ø§Ø¸Øª Ø´Ø¯Ù?">
 <!ENTITY torbutton.cookiedialog.domainCol "Ù?Ù?Ø²Ø¨Ø§Ù?">
diff --git a/src/chrome/locale/fi/securityLevel.properties b/src/chrome/locale/fi/securityLevel.properties
new file mode 100644
index 00000000..f270671f
--- /dev/null
+++ b/src/chrome/locale/fi/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Palauta Oletukset
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index 136cca34..d2088a6a 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "EvÃ¤steiden suojaukset">
 <!ENTITY torbutton.context_menu.cookieProtections.key "E">
 <!ENTITY torbutton.button.tooltip "Klikkaa Torbutton aktiiviseksi">
-<!ENTITY torbutton.prefs.restore_defaults "Palauta Oletukset">
 <!ENTITY torbutton.cookiedialog.title "Hallitse evÃ¤steiden suojauksia">
 <!ENTITY torbutton.cookiedialog.lockCol "Suojaus">
 <!ENTITY torbutton.cookiedialog.domainCol "Palvelin">
diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/fil/torbutton.dtd
+++ b/src/chrome/locale/fil/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/fo/torbutton.dtd
+++ b/src/chrome/locale/fo/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/fr/securityLevel.properties b/src/chrome/locale/fr/securityLevel.properties
new file mode 100644
index 00000000..54f59750
--- /dev/null
+++ b/src/chrome/locale/fr/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Niveau de sÃ©curitÃ©
+securityLevel.standard.level = Normal
+securityLevel.standard.summary = Toutes les fonctions du Navigateur Tor et des sites Web sont activÃ©es.
+securityLevel.safer.level = Plus sÃ»r
+securityLevel.safer.summary = DÃ©sactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraÃ®ner une perte de fonctionnalitÃ© de certains sites Web.
+securityLevel.safer.description1 = JavaScript est dÃ©sactivÃ© pour les sites non HTTPS.
+securityLevel.safer.description2 = Certaines polices et certains symboles mathÃ©matiques sont dÃ©sactivÃ©s.
+securityLevel.safer.description3 = Le son et la vidÃ©o (mÃ©diasÂ HTML5) sont Â«Â cliquer pour lireÂ Â».
+securityLevel.safest.level = Le plus sÃ»r
+securityLevel.safest.summary = Ne permettre que les fonctions de sites Web qui sont exigÃ©es pour les sites fixes et les services de base. Ces changements affectent les images, les mÃ©dias et les scripts.
+securityLevel.safest.description1 = JavaScript est dÃ©sactivÃ© par dÃ©faut pour tous les sites.
+securityLevel.safest.description2 = Certaines polices, icÃ´nes, images et certains symboles mathÃ©matiques sont dÃ©sactivÃ©s.
+securityLevel.safest.description3 = Le son et la vidÃ©o (mÃ©diasÂ HTML5) sont Â«Â cliquer pour lireÂ Â».
+securityLevel.custom.summary = Les prÃ©fÃ©rences personnalisÃ©es de votre navigateur ont entraÃ®nÃ© des paramÃ¨tres de sÃ©curitÃ© inhabituels. Pour des raisons de sÃ©curitÃ© et de protection des informations personnelles, nous vous recommandons de choisir un des niveaux de sÃ©curitÃ© par dÃ©faut.
+securityLevel.learnMore = En apprendre davantage
+securityLevel.restoreDefaults = Revenir aux paramÃ¨tres par dÃ©faut
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 294c2f9f..be848ce6 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ParamÃ¨tres de sÃ©curitÃ©">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ParamÃ¨tres du rÃ©seau Tor">
 <!ENTITY torbutton.context_menu.networksettings.key "R">
 <!ENTITY torbutton.context_menu.downloadUpdate "VÃ©rifier les mises Ã  jour du Navigateur Tor">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "T">
 <!ENTITY torbutton.button.tooltip "Cliquer pour lancer BoutonTor">
 <!ENTITY torbutton.prefs.security_settings "ParamÃ¨tres de sÃ©curitÃ© du Navigateur Tor">
-<!ENTITY torbutton.prefs.restore_defaults "Revenir aux paramÃ¨tres par dÃ©faut">
-<!ENTITY torbutton.prefs.custom_warning "Les prÃ©fÃ©rences personnalisÃ©es de votre navigateur ont entraÃ®nÃ© des paramÃ¨tres de sÃ©curitÃ© inhabituels. Pour des raisons de sÃ©curitÃ© et de protection des informations personnelles, nous vous recommandons de choisir un des niveaux de sÃ©curitÃ© par dÃ©faut.">
 <!ENTITY torbutton.cookiedialog.title "GÃ©rer les protections des fichiers tÃ©moins">
 <!ENTITY torbutton.cookiedialog.lockCol "ProtÃ©gÃ©">
 <!ENTITY torbutton.cookiedialog.domainCol "HÃ´te">
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/fy/torbutton.dtd
+++ b/src/chrome/locale/fy/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ga/securityLevel.properties b/src/chrome/locale/ga/securityLevel.properties
new file mode 100644
index 00000000..e728187e
--- /dev/null
+++ b/src/chrome/locale/ga/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = LeibhÃ©al SlÃ¡ndÃ¡la
+securityLevel.standard.level = GnÃ¡thshlÃ¡ndÃ¡il
+securityLevel.standard.summary = Gach gnÃ© de bhrabhsÃ¡laÃ Tor agus gach gnÃ© de shuÃmh GhrÃ©asÃ¡in ar siÃºl.
+securityLevel.safer.level = NÃos SÃ¡bhÃ¡ilte
+securityLevel.safer.summary = DÃchumasaÃtear gnÃ©ithe de shuÃmh atÃ¡ contÃºirteach go minic; dÃ¡ bharr seo, nÃ fheidhmeoidh gach suÃomh mar is ceart.
+securityLevel.safer.description1 = TÃ¡ JavaScript dÃchumasaithe ar shuÃmh nach mbaineann ÃºsÃ¡id as HTTPS.
+securityLevel.safer.description2 = TÃ¡ roinnt clÃ³fhoirne agus siombailÃ matamaiticiÃºla dÃchumasaithe.
+securityLevel.safer.description3 = Caithfidh tÃº fuaimeanna agus fÃseÃ¡in (meÃ¡in HTML5) a chliceÃ¡il lena seinm.
+securityLevel.safest.level = Is SÃ¡bhÃ¡ilte
+securityLevel.safest.summary = NÃ cheadaÃtear ach na gnÃ©ithe atÃ¡ de dhÃth ar shuÃmh statacha agus ar bhunseirbhÃsÃ. TÃ©ann na hathruithe seo i bhfeidhm ar ÃomhÃ¡nna, ar mheÃ¡in, agus ar scripteanna.
+securityLevel.safest.description1 = TÃ¡ JavaScript dÃchumasaithe ar gach suÃomh de rÃ©ir rÃ©amhshocraithe.
+securityLevel.safest.description2 = TÃ¡ roinnt clÃ³fhoirne, deilbhÃnÃ, siombailÃ matamaiticiÃºla, agus ÃomhÃ¡nna dÃchumasaithe.
+securityLevel.safest.description3 = Caithfidh tÃº fuaimeanna agus fÃseÃ¡in (meÃ¡in HTML5) a chliceÃ¡il lena seinm.
+securityLevel.custom.summary = TÃ¡ socruithe slÃ¡ndÃ¡la an bhrabhsÃ¡laÃ as an ngnÃ¡th faoi lÃ¡thair, mar thoradh ar do chuid sainroghanna.  Ar chÃºiseanna slÃ¡ndÃ¡la agus prÃobhÃ¡ideachais, molaimid duit ceann de na leibhÃ©il slÃ¡ndÃ¡la rÃ©amhshocraithe a roghnÃº.
+securityLevel.learnMore = Tuilleadh eolais
+securityLevel.restoreDefaults = Fill ar na RÃ©amhshocruithe
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index 8738ae94..6f92b5bf 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ciorcad Nua Tor don SuÃomh seo">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Socruithe SlÃ¡ndÃ¡la...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Socruithe LÃonra Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Lorg NuashonrÃº ar BhrabhsÃ¡laÃ Tor...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "CliceÃ¡il chun cnaipe Tor a thÃºsÃº">
 <!ENTITY torbutton.prefs.security_settings "Socruithe SlÃ¡ndÃ¡la BhrabhsÃ¡laÃ Tor">
-<!ENTITY torbutton.prefs.restore_defaults "Fill ar na RÃ©amhshocruithe">
-<!ENTITY torbutton.prefs.custom_warning "TÃ¡ socruithe slÃ¡ndÃ¡la an bhrabhsÃ¡laÃ as an ngnÃ¡th faoi lÃ¡thair, mar thoradh ar do chuid sainroghanna.  Ar chÃºiseanna slÃ¡ndÃ¡la agus prÃobhÃ¡ideachais, molaimid duit ceann de na leibhÃ©il slÃ¡ndÃ¡la rÃ©amhshocraithe a roghnÃº.">
 <!ENTITY torbutton.cookiedialog.title "Bainistigh CaomhnÃº FianÃ¡n">
 <!ENTITY torbutton.cookiedialog.lockCol "Cosanta">
 <!ENTITY torbutton.cookiedialog.domainCol "Ã?strÃomhaire">
diff --git a/src/chrome/locale/gl/securityLevel.properties b/src/chrome/locale/gl/securityLevel.properties
new file mode 100644
index 00000000..fd621499
--- /dev/null
+++ b/src/chrome/locale/gl/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Restabelecer valores predeterminados
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index fae2b37a..c6ae5f79 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restabelecer valores predeterminados">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/gu/securityLevel.properties b/src/chrome/locale/gu/securityLevel.properties
new file mode 100644
index 00000000..e6eabc59
--- /dev/null
+++ b/src/chrome/locale/gu/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = àª®à«?àª³àªà«?àª¤ àªªàª¾àª?à«?àª? àª²àª¾àªµà«?
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index 32adbee7..0a9faa2d 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "àª?à«?àª°àª¬àª?àª¨ àª¶àª°à«? àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?">
-<!ENTITY torbutton.prefs.restore_defaults "àª®à«?àª³àªà«?àª¤ àªªàª¾àª?à«?àª? àª²àª¾àªµà«?">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/gun/torbutton.dtd
+++ b/src/chrome/locale/gun/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ha/torbutton.dtd
+++ b/src/chrome/locale/ha/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/he/securityLevel.properties b/src/chrome/locale/he/securityLevel.properties
new file mode 100644
index 00000000..2875a982
--- /dev/null
+++ b/src/chrome/locale/he/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = ×¨×?×ª ×?×?×?×?×?
+securityLevel.standard.level = ×ª×§× ×?
+securityLevel.standard.summary = ×?×? ×?×?×?×¤×?×?× ×?×? ×©×? ×?×¤×?×¤×? Tor ×?×?×?×¤×?×?× ×? ×?×ª×¨ ×?×?×©×?×ª×?×?.
+securityLevel.safer.level = ×?×?×?×? ×?×?×ª×¨
+securityLevel.safer.summary = ×?×©×?×?×ª ×?×?×¤×?×?× ×? ×?×ª×¨ ×©×?×¡×?×?× ×?×? ×?×¢×?×ª×?×? ×§×¨×?×?×?×ª, ×?×? ×©×?×?×¨×? ×?×?×¡×¤×¨ ×?×ª×¨×?×? ×?×?×?×? ×ª×¤×§×?×?×?×?×ª.
+securityLevel.safer.description1 = JavaScript ×?×?×©×?×ª ×?×?×? ×?×?×ª×¨×?×? ×©×?×?× ×? HTTPS.
+securityLevel.safer.description2 = ×?×¡×¤×¨ ×?×?×¤× ×?×? ×?×¡×?×?×?×? ×?×ª×?×?×?×?×? ×?×?×©×?×ª×?×?.
+securityLevel.safer.description3 = ×©×?×¢ ×?×?×?×?×?×? (×?×?×?×ª HTML5) ×?×? ×?×?×¥-×?×?×?-×?× ×?×?.
+securityLevel.safest.level = ×?×?×? ×?×?×?×?
+securityLevel.safest.summary = ×?×ª×?×¨ ×¨×§ ×?×?×?×¤×?×?× ×? ×?×ª×¨ ×?×?×¨×?×©×?×? ×¢×?×?×¨ ×?×ª×¨×?×? × ×?×?×?×?×? ×?×©×?×¨×?×ª×?×? ×?×¡×?×?×?×?×?. ×©×?× ×?×?×?×? ×?×?×? ×?×©×¤×?×¢×?×? ×¢×? ×ª×?×?× ×?×ª, ×?×?×?×? ×?×ª×¡×¨×?×?×?×?.
+securityLevel.safest.description1 = JavaScript ×?×?×©×?×ª ×?×?×¨×?×¨×ª ×?×?×?×? ×?×?×? ×?×?×ª×¨×?×?.
+securityLevel.safest.description2 = ×?×¡×¤×¨ ×?×?×¤× ×?×?, ×¦×?×?×?×?×ª, ×¡×?×?×?×? ×?×ª×?×?×?×?×? ×?×ª×?×?× ×?×ª ×?×?×©×?×ª×?×?.
+securityLevel.safest.description3 = ×©×?×¢ ×?×?×?×?×?×? (×?×?×?×ª HTML5) ×?×? ×?×?×¥-×?×?×?-×?× ×?×?.
+securityLevel.custom.summary = ×?×¢×?×¤×?×ª ×?×?×¤×?×¤×? ×?×?×?×ª×?×?×?×ª ×©×?×? × ×?×¢×? ×?×?×?×?×¨×?×ª ×?×?×?×?×? ×?×?×ª×? ×©×?×¨×ª×?×?×ª. ×?×?×¢×?×? ×?×?×?×?×? ×?×¤×¨×?×?×?×ª, ×?× ×? ×?×?×?×?×¦×?×? ×?×? ×?×?×?×?×¨ ×?×?×?×ª ×?×¨×?×?×ª ×?×?×?×?×?×? ×©×? ×?×¨×?×¨×ª ×?×?×?×?×?.
+securityLevel.learnMore = ×?×?×? ×¢×?×?
+securityLevel.restoreDefaults = ×©×?×?×¨ ×?×¨×?×¨×?×ª ×?×?×?×?
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index c5373e36..0392f837 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "× ×ª×?×? Tor ×?×?×© ×?×?×ª×¨ ×?×?">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "×?×?×?×¨×?×ª ×?×?×?×?×?...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "×?×?×?×¨×?×ª ×¨×©×ª Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "×?×?×?×§ ×?×?×¨ ×¢×?×?×?×? ×?×?×¤×?×¤×? Tor...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "×?×?×¥ ×?×?×?×? ×?×?×ª×?×? ×?×ª Torbutton">
 <!ENTITY torbutton.prefs.security_settings "×?×?×?×¨×?×ª ×?×?×?×?×? ×©×? ×?×¤×?×¤×? Tor">
-<!ENTITY torbutton.prefs.restore_defaults "×©×?×?×¨ ×?×¨×?×¨×?×ª ×?×?×?×?">
-<!ENTITY torbutton.prefs.custom_warning "×?×¢×?×¤×?×ª ×?×?×¤×?×¤×? ×?×?×?×ª×?×?×?×ª ×©×?×? × ×?×¢×? ×?×?×?×?×¨×?×ª ×?×?×?×?×? ×?×?×ª×? ×©×?×¨×ª×?×?×ª. ×?×?×¢×?×? ×?×?×?×?×? ×?×¤×¨×?×?×?×ª, ×?× ×? ×?×?×?×?×¦×?×? ×?×? ×?×?×?×?×¨ ×?×?×?×ª ×?×¨×?×?×ª ×?×?×?×?×?×? ×©×? ×?×¨×?×¨×ª ×?×?×?×?×?.">
 <!ENTITY torbutton.cookiedialog.title "× ×?×? ×?×?× ×?×ª ×¢×?×?×?×?×ª">
 <!ENTITY torbutton.cookiedialog.lockCol "×?×?×?×?">
 <!ENTITY torbutton.cookiedialog.domainCol "×?×?×¨×?">
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 710b298e..8f3852af 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "à¤?à¥?à¤° à¤¬à¤?à¤¨ à¤?à¥? à¤?à¤°à¤?à¤à¤¿à¤¤ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤¯à¥? à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 67d9f181..e46ff88f 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tite kolaÄ?iÄ?a">
 <!ENTITY torbutton.context_menu.cookieProtections.key "Z">
 <!ENTITY torbutton.button.tooltip "Kliknite za pokretanje Torbuttona">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ht/torbutton.dtd
+++ b/src/chrome/locale/ht/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/hu/securityLevel.properties b/src/chrome/locale/hu/securityLevel.properties
new file mode 100644
index 00000000..9fd3e174
--- /dev/null
+++ b/src/chrome/locale/hu/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = BiztonsÃ¡gi szint
+securityLevel.standard.level = NormÃ¡l
+securityLevel.standard.summary = Minden Tor Browser Ã©s weboldal szolgÃ¡ltatÃ¡s engedÃ©lyezve.
+securityLevel.safer.level = BiztonsÃ¡gosabb
+securityLevel.safer.summary = Azon weboldal szolgÃ¡ltatÃ¡sok tiltÃ¡sa, amelyek tÃ¶bbnyire veszÃ©lyesek, ami nÃ©hÃ¡ny oldal mÅ±kÃ¶dÃ©sÃ©nek problÃ©mÃ¡it okozhatja.
+securityLevel.safer.description1 = A JavaScript tiltott a nem-HTTPS oldalkon.
+securityLevel.safer.description2 = NÃ©hÃ¡ny betÅ±tÃpus Ã©s matematikai szimbÃ³lum tiltÃ¡sra kerÃ¼lt.
+securityLevel.safer.description3 = AudiÃ³ Ã©s videÃ³ (HTML5 mÃ©dia) kattintÃ¡sra indul.
+securityLevel.safest.level = LegbiztonsÃ¡gosabb
+securityLevel.safest.summary = Csak azon weboldal szolgÃ¡ltatÃ¡sok engedÃ©lyezÃ©se, amelyek a statikus, vagy alap szolgÃ¡ltatÃ¡sokhoz szÃ¼ksÃ©gesek. Ezek a beÃ¡llÃtÃ¡sok Ã©rintik a kÃ©peket, mÃ©diÃ¡kat Ã©s scripteket.
+securityLevel.safest.description1 = A JavaScript alapÃ©rtelmezetten tiltott minden oldalon.
+securityLevel.safest.description2 = NÃ©hÃ¡ny betÅ±tÃpus, ikon Ã©s matematikai szimbÃ³lum Ã©s a kÃ©pek tiltÃ¡sra kerÃ¼ltek.
+securityLevel.safest.description3 = AudiÃ³ Ã©s videÃ³ (HTML5 mÃ©dia) kattintÃ¡sra indul.
+securityLevel.custom.summary = Az Ã?n Ã¡ltal eszkÃ¶zÃ¶lt egyÃ©ni bÃ¶ngÃ©szÅ?i beÃ¡llÃtÃ¡sok eredmÃ©nyekÃ©pp biztonsÃ¡gi kockÃ¡zatok merÃ¼lhetnek fel. BiztonsÃ¡gi Ã©s adatvÃ©delmi szempontokbÃ³l kÃ©rjÃ¼k vÃ¡lasszon az alapÃ©rtelmezett biztonsÃ¡gi szintek kÃ¶zÃ¼l.
+securityLevel.learnMore = TovÃ¡bbi informÃ¡ciÃ³
+securityLevel.restoreDefaults = AlapÃ©rtelmezÃ©sek visszaÃ¡llÃtÃ¡sa
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 4e71b100..0cfce62f 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "S">
 <!ENTITY torbutton.context_menu.new_circuit "Ã?j Tor Ã¡ramkÃ¶r ehhez az oldalhoz">
 <!ENTITY torbutton.context_menu.new_circuit_key "S">
-<!ENTITY torbutton.context_menu.preferences "BiztonsÃ¡gi beÃ¡llÃtÃ¡sok...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser frissÃtÃ©sek keresÃ©se">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "S">
 <!ENTITY torbutton.button.tooltip "Kattintson a Torbutton inicializÃ¡lÃ¡sÃ¡hoz">
 <!ENTITY torbutton.prefs.security_settings "Tor Browser biztonsÃ¡gi beÃ¡llÃtÃ¡sok">
-<!ENTITY torbutton.prefs.restore_defaults "AlapÃ©rtelmezÃ©sek visszaÃ¡llÃtÃ¡sa">
-<!ENTITY torbutton.prefs.custom_warning "Az Ã?n Ã¡ltal eszkÃ¶zÃ¶lt egyÃ©ni bÃ¶ngÃ©szÅ?i beÃ¡llÃtÃ¡sok eredmÃ©nyekÃ©pp biztonsÃ¡gi kockÃ¡zatok merÃ¼lhetnek fel. BiztonsÃ¡gi Ã©s adatvÃ©delmi szempontokbÃ³l kÃ©rjÃ¼k vÃ¡lasszon az alapÃ©rtelmezett biztonsÃ¡gi szintek kÃ¶zÃ¼l.">
 <!ENTITY torbutton.cookiedialog.title "SÃ¼ti vÃ©delem kezelÃ©se">
 <!ENTITY torbutton.cookiedialog.lockCol "VÃ©dett">
 <!ENTITY torbutton.cookiedialog.domainCol "Ã?llomÃ¡s">
diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/hy/torbutton.dtd
+++ b/src/chrome/locale/hy/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/id/securityLevel.properties b/src/chrome/locale/id/securityLevel.properties
new file mode 100644
index 00000000..597c9ebe
--- /dev/null
+++ b/src/chrome/locale/id/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Tingkat Keamanan
+securityLevel.standard.level = Standar
+securityLevel.standard.summary = Semua fitur dari Tor Browser dan situs web diaktifkan.
+securityLevel.safer.level = Lebih aman
+securityLevel.safer.summary = Menonaktifkan fitur-fitur situs web yang sering berbahaya, ini akan membuat beberapa situs kehilangan fungsionalitas.
+securityLevel.safer.description1 = JavaScript dinonaktifkan di semua situs non-HTTPS.
+securityLevel.safer.description2 = Beberapa font dan simbol matematika dinonaktifkan.
+securityLevel.safer.description3 = Audio dan video (media HTML5 media) dijalankan saat diklik.
+securityLevel.safest.level = Paling aman
+securityLevel.safest.summary = Hanya menjalankan fitur-fitur situs yang diperlukan untuk menjalankan situs web statis dan servis dasar. Perubahan ini mempengaruhi gambar, media, dan skrip.
+securityLevel.safest.description1 = JavaScript dinonaktifkan secara default di semua situs.
+securityLevel.safest.description2 = Beberapa font, icon, simbol matematika, dan gambar dinonaktifkan.
+securityLevel.safest.description3 = Audio dan video (media HTML5 media) dijalankan saat diklik.
+securityLevel.custom.summary = Preferensi browser khusus anda telah membuat pengaturan keamanan yang tidak biasa. Untuk alasan keamanan dan privasi, kami menyarankan anda untuk memilih satu dari tingkat keamanan bawaan.
+securityLevel.learnMore = Pelajari lebih lanjut
+securityLevel.restoreDefaults = Kembalikan Kestandar
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index c12cfb6b..ecf771f4 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Sirkuit Tor Baru untuk Situs ini">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Pengaturan Keamanan...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Pengaturan Jaringan Torâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Cek Versi Peramban Tor Terkini">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan TombolTor">
 <!ENTITY torbutton.prefs.security_settings "Pengaturan Keamanan Tor Browser">
-<!ENTITY torbutton.prefs.restore_defaults "Kembalikan Kestandar">
-<!ENTITY torbutton.prefs.custom_warning "Preferensi browser khusus anda telah membuat pengaturan keamanan yang tidak biasa. Untuk alasan keamanan dan privasi, kami menyarankan anda untuk memilih satu dari tingkat keamanan bawaan.">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/is/securityLevel.properties b/src/chrome/locale/is/securityLevel.properties
new file mode 100644
index 00000000..b58ccd38
--- /dev/null
+++ b/src/chrome/locale/is/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Ã?ryggisstig
+securityLevel.standard.level = StaÃ°laÃ°
+securityLevel.standard.summary = Allir eiginleikar Tor-vafrans og vefsvÃ¦Ã°isins eru virkjaÃ°ir.
+securityLevel.safer.level = Ã?ruggara
+securityLevel.safer.summary = Gerir Ã³virka Ã½msa eiginleika vefsvÃ¦Ã°a sem oft eru hÃ¦ttulegir, en veldur Ã¾vÃ aÃ° sum vefsvÃ¦Ã°i hÃ¦tta aÃ° virka eins og Ã¾au eiga aÃ° gera.
+securityLevel.safer.description1 = JavaScript er Ã³virkt Ã¡ Ã¶llum ekki-HTTPS vefjum.
+securityLevel.safer.description2 = Sumt letur og stÃ¦rÃ°frÃ¦Ã°itÃ¡kn eru Ã³virk.
+securityLevel.safer.description3 = HljÃ³Ã° og myndskeiÃ° (HTML5-gagnamiÃ°la) Ã¾arf aÃ° smella Ã¡ til aÃ° spila.
+securityLevel.safest.level = Ã?ruggast
+securityLevel.safest.summary = Leyfir aÃ°eins Ã¾Ã¡ eiginleika vefsvÃ¦Ã°a sem krafist er fyrir beinan lestur (static sites) og grunnÃ¾jÃ³nustur. Ã?essar breytingar hafa Ã¡hrif Ã¡ myndir, margmiÃ°lunargÃ¶gn og skriftur.
+securityLevel.safest.description1 = JavaScript er sjÃ¡lfgefiÃ° Ã³virkt Ã¡ Ã¶llum vefsvÃ¦Ã°um.
+securityLevel.safest.description2 = Sumt letur, tÃ¡knmyndir, myndir og stÃ¦rÃ°frÃ¦Ã°itÃ¡kn eru Ã³virk.
+securityLevel.safest.description3 = HljÃ³Ã° og myndskeiÃ° (HTML5-gagnamiÃ°la) Ã¾arf aÃ° smella Ã¡ til aÃ° spila.
+securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.
+securityLevel.learnMore = LÃ¦ra meira
+securityLevel.restoreDefaults = Frumstilla Ã¡ sjÃ¡lfgefiÃ°
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index a03a7329..2468114e 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "NÃ½ Tor-rÃ¡s fyrir Ã¾etta vefsvÃ¦Ã°i">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Ã?ryggisstillingarâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Netkerfisstillingar Torâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "AthugaÃ°u meÃ° uppfÃ¦rslur Tor-vafra...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Smelltu til aÃ° kveikja Ã¡ Tor-hnapp">
 <!ENTITY torbutton.prefs.security_settings "Ã?ryggisstillingar Tor-vafrans">
-<!ENTITY torbutton.prefs.restore_defaults "Frumstilla Ã¡ sjÃ¡lfgefiÃ°">
-<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
 <!ENTITY torbutton.cookiedialog.title "SÃ½sla meÃ° varnir gegn vefkÃ¶kum">
 <!ENTITY torbutton.cookiedialog.lockCol "VariÃ°">
 <!ENTITY torbutton.cookiedialog.domainCol "HÃ½silvÃ©l">
diff --git a/src/chrome/locale/it/securityLevel.properties b/src/chrome/locale/it/securityLevel.properties
new file mode 100644
index 00000000..14793258
--- /dev/null
+++ b/src/chrome/locale/it/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Livello di Sicurezza
+securityLevel.standard.level = Standard
+securityLevel.standard.summary = Tutte le funzionalitÃ  di Tor Browser e dei siti sono attive.
+securityLevel.safer.level = Sicuro
+securityLevel.safer.summary = Disattiva le caratteristiche dei siti spesso pericolose, causando la perdita di funzionalitÃ  di alcuni siti.
+securityLevel.safer.description1 = JavaScript Ã¨ disattivato nei siti non-HTTPS.
+securityLevel.safer.description2 = Alcuni caratteri e simboli matematici sono disattivati.
+securityLevel.safer.description3 = Audio e video (media HTML5) sono click-to-play.
+securityLevel.safest.level = Molto sicuro
+securityLevel.safest.summary = Permette solo le funzionalitÃ  necessarie per siti statici e servizi di base. Queste modifiche influiscono su immagini, media e script.
+securityLevel.safest.description1 = JavaScript Ã¨ disattivato in tutti i siti in modo predefinito.
+securityLevel.safest.description2 = Alcuni caratteri, icone, simboli matematici e immagini sono disattivati.
+securityLevel.safest.description3 = Audio e video (media HTML5) sono click-to-play.
+securityLevel.custom.summary = Le tue impostazioni personalizzate del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti.
+securityLevel.learnMore = Per saperne di piÃ¹
+securityLevel.restoreDefaults = Ripristina impostazioni iniziali
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index a45be803..3c46b13e 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nuovo Circuito Tor per questo Sito">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Impostazioni di sicurezza...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Impostazioni della rete Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Controllo degli aggiornamenti di Tor Browser...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Impostazioni di Sicurezza Tor Browser">
-<!ENTITY torbutton.prefs.restore_defaults "Ripristina impostazioni iniziali">
-<!ENTITY torbutton.prefs.custom_warning "Le tue impostazioni personalizzate del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti.">
 <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protetto">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ja/securityLevel.properties b/src/chrome/locale/ja/securityLevel.properties
new file mode 100644
index 00000000..30c74471
--- /dev/null
+++ b/src/chrome/locale/ja/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = ã?»ã?ã?¥ã?ªã??ã?£ã?¬ã??ã?«
+securityLevel.standard.level = æ¨?æº?
+securityLevel.standard.summary = Tor Browser ã?¨ã?¦ã?§ã??ã?µã?¤ã??ã?®ã??ã?¹ã?¦ã?®æ©?è?½ã??æ??å?¹å??ã??ã??ã?¾ã??ã??
+securityLevel.safer.level = ã??ã??å®?å?¨
+securityLevel.safer.summary = ã?¦ã?§ã??ã?µã?¤ã??ã?®ã??ã?°ã??ã?°å?±é?ºã?§ã??ã??æ©?è?½ã??ç?¡å?¹å??ã??ã?¾ã??ã??ã?µã?¤ã??ã?«ã??ã?£ã?¦ã?¯æ£å¸¸ã?«å??ä½?ã??ã?ªã??ã?ªã??ã?¾ã??ã??
+securityLevel.safer.description1 = HTTPSé??å¯¾å¿?ã?®ã?µã?¤ã??ã?§ JavaScript ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??
+securityLevel.safer.description2 = ã??ã??ã?¤ã??ã?®ã??ã?©ã?³ã??ã?¨æ?°å¦è¨?å?·ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??
+securityLevel.safer.description3 = ã?ªã?¼ã??ã?£ã?ªã?¨ã??ã??ã?ª(HTML5ã?¡ã??ã?£ã?¢)ã?¯ã?¯ã?ªã??ã?¯ã??ã??ã?¨å??ç??ã??ã??ã?¾ã??ã??
+securityLevel.safest.level = æ??ã??å®?å?¨
+securityLevel.safest.summary = é??ç??ã?ªã?µã?¤ã??ã?¨å?ºæ?¬ç??ã?ªã?µã?¼ã??ã?¹ã?«å¿?è¦?ã?ªæ©?è?½ã? ã??ã??è¨±å?¯ã??ã?¾ã??ã??ã??ã?®å¤?æ?´ã?¯ç?»å??ã??ã?¡ã??ã?£ã?¢ã??ã?¹ã?¯ã?ªã??ã??ã?«å½±é?¿ã??ã?¾ã??ã??
+securityLevel.safest.description1 = ã??ã?¹ã?¦ã?®ã?µã?¤ã??ã?§ JavaScript ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??
+securityLevel.safest.description2 = ã??ã??ã?¤ã??ã?®ã?¢ã?¤ã?³ã?³ã??æ?°å¦è¨?å?·ã??ã??ã?³ç?»å??ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??
+securityLevel.safest.description3 = ã?ªã?¼ã??ã?£ã?ªã?¨ã??ã??ã?ª(HTML5ã?¡ã??ã?£ã?¢)ã?¯ã?¯ã?ªã??ã?¯ã??ã??ã?¨å??ç??ã??ã??ã?¾ã??ã??
+securityLevel.custom.summary = ã??ã?ªã??ã?®ã??ã?©ã?¦ã?¶ã?¼ã?«ã??ã??ã??ã?«ã?¹ã?¿ã? è¨å®?ã?¯ã?»ã?ã?¥ã?ªã??ã?£çµ?æ??ã?«å½±é?¿ã??å??ã?¼ã??ã?¾ã??ã??ã??ã?»ã?ã?¥ã?ªã??ã?£ã?¨ã??ã?©ã?¤ã??ã?·ã?¼ã?«é?¢ã??ã?¦ã?¯ã??ã??ã?©ã?«ã??ã?®ã?»ã?ã?¥ã?ªã??ã?£ã?¬ã??ã?«ã?®ã?²ã?¨ã?¤ã??é?¸æ??ã??ã??ã??ã?¨ã??ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??
+securityLevel.learnMore = ã??ã??ã?«ç?¥ã??
+securityLevel.restoreDefaults = ã??ã??ã?©ã?«ã??ã?«ã??ã?©ã??
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index ae495084..be6c4dc0 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "ã??ã?®ã?µã?¤ã??ç?¨ã?®æ?°ã??ã?? Tor ã?µã?¼ã?ã??ã??">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ã?»ã?ã?¥ã?ªã??ã?£ã?®è¨å®?...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?®è¨å®?...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser ã?®ã?¢ã??ã??ã??ã?¼ã??ã??ç¢ºèª?">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbuttonã??å??æ??ç?¶æ??ã?«æ?»ã??">
 <!ENTITY torbutton.prefs.security_settings "Tor Browser ã?»ã?ã?¥ã?ªã??ã?£ã?®è¨å®?">
-<!ENTITY torbutton.prefs.restore_defaults "ã??ã??ã?©ã?«ã??ã?«ã??ã?©ã??">
-<!ENTITY torbutton.prefs.custom_warning "ã??ã?ªã??ã?®ã??ã?©ã?¦ã?¶ã?¼ã?«ã??ã??ã??ã?«ã?¹ã?¿ã? è¨å®?ã?¯ã?»ã?ã?¥ã?ªã??ã?£çµ?æ??ã?«å½±é?¿ã??å??ã?¼ã??ã?¾ã??ã??ã??ã?»ã?ã?¥ã?ªã??ã?£ã?¨ã??ã?©ã?¤ã??ã?·ã?¼ã?«é?¢ã??ã?¦ã?¯ã??ã??ã?©ã?«ã??ã?®ã?»ã?ã?¥ã?ªã??ã?£ã?¬ã??ã?«ã?®ã?²ã?¨ã?¤ã??é?¸æ??ã??ã??ã??ã?¨ã??ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??">
 <!ENTITY torbutton.cookiedialog.title "Cookieä¿?è·ã??ç®¡ç??">
 <!ENTITY torbutton.cookiedialog.lockCol "ä¿?è·æ¸?ã?¿">
 <!ENTITY torbutton.cookiedialog.domainCol "ã??ã?¹ã??">
diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/jv/torbutton.dtd
+++ b/src/chrome/locale/jv/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ka/securityLevel.properties b/src/chrome/locale/ka/securityLevel.properties
new file mode 100644
index 00000000..758209d6
--- /dev/null
+++ b/src/chrome/locale/ka/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á??á??á??á??
+securityLevel.standard.level = á?©á??á??á?£á??á??á??á? á??á??á??
+securityLevel.standard.summary = Tor-á??á? á??á?£á??á??á? á??á?¡á?? á??á?? á??á??á??á?¡á??á??á?¢á??á?¡ á?§á??á??á??á?? á?¨á??á?¡á??á?«á??á??á??á??á??á??á?? á?©á??á? á??á?£á??á??á??.
+securityLevel.safer.level = á??á??á?¢á??á?? á??á??á?ªá?£á??á??
+securityLevel.safer.summary = á??á??á??á??á??á?¨á??á??á?? á??á??á??á?¡á??á??á?¢á??á?¡ á?¡á??á?¤á? á??á?®á??á?¡á?¨á??á??á?ªá??á??á??á?? á?¨á??á?¡á??á?«á??á??á??á??á??á??á??á??á??, á?¡á??á??á??á? á??á?£á??á??á?? á?¡á??á??á?¢á??á??á??á?¡ á??á??á?¬á??á??á?? á??á??á?  á??á??á?£á?¨á??á??á??á??á?¡ á??á??á??á??á? á??á?£á??á??á??.
+securityLevel.safer.description1 = JavaScript á??á??á??á??á?¨á?£á??á??á?? HTTPS-á?¡ á??á? á??á?¥á??á??á?? á?§á??á??á??á?? á?¡á??á??á?¢á??á??.
+securityLevel.safer.description2 = á?¨á? á??á?¤á?¢á??á??á??á?¡á?? á??á?? á??á??á??á??á??á??á?¢á??á??á?£á? á?? á?¡á??á??á??á??á??á??á??á??á??á?¡ á??á??á?¬á??á??á?? á??á??á??á??á?¨á?£á??á??á??.
+securityLevel.safer.description3 = á?®á??á??á??á??á??á?? á??á?? á??á??á??á??á??á?¤á??á??á??á??á??á?? (HTML5) á??á?¨á??á??á??á?? á??á?®á??á??á??á?? á??á??á?¬á??á??á??á??á??á??á??.
+securityLevel.safest.level = á?¡á? á?£á??á??á??á?? á??á??á?ªá?£á??á??
+securityLevel.safest.summary = á??á??á?¨á??á??á??á?£á??á??á?? á??á?®á??á??á??á?? á??á?¡ á?¨á??á?¡á??á?«á??á??á??á??á??á??á??á??á??, á? á??á??á??á??á??á?¡á??á?ª á?¡á??á?á??á? á??á??á??á?¡ á?£á?ªá??á??á??á??á?? á?¨á??á??á??á??á??á?¡á??á?¡ á??á?¥á??á??á?? á?¡á??á??á?¢á??á??á?? á??á?? á?«á??á? á??á??á??á??á?? á??á??á??á?¡á??á?®á?£á? á??á??á??á??á??. á?ªá??á??á??á??á??á??á??á??á?? á?¨á??á??á?®á??á??á?? á?¡á?£á? á??á??á??á??á?¡, á?¤á??á??á??á??á??á?¡á?? á??á?? á?¡á??á? á??á??á?¢á??á??á?¡.
+securityLevel.safest.description1 = JavaScript á??á??á??á??á?¨á?£á??á??á?? á?§á??á??á??á?? á?¡á??á??á?¢á??á?? á??á??á??á?£á??á??á?¡á?®á??á??á??á??á??.
+securityLevel.safest.description2 = á?¨á? á??á?¤á?¢á??á??á??á?¡, á?®á??á?¢á?£á??á??á??á??á?¡, á??á??á??á??á??á??á?¢á??á??á?£á? á?? á?¡á??á??á??á??á??á??á??á??á??á?¡á?? á??á?? á?¡á?£á? á??á??á??á??á??á?¡ á??á??á?¬á??á??á?? á??á??á??á??á?¨á?£á??á??á??.
+securityLevel.safest.description3 = á?®á??á??á??á??á??á?? á??á?? á??á??á??á??á??á?¤á??á??á??á??á??á?? (HTML5) á??á?¨á??á??á??á?? á??á?®á??á??á??á?? á??á??á?¬á??á??á??á??á??á??á??.
+securityLevel.custom.summary = á??á?¥á??á??á?? á??á??á??á?  á??á??á??á??á??á??á??á?£á??á?? á??á??á? á??á??á??á?¢á? á??á??á?? á??á? á??á?£á??á??á? á?¨á??, á??á? á??á?? á??á??á?¡á??á?¦á??á??á?? á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡á??á??á??á?¡. á??á??á? á??á??á?? á??á??á??á??á?ªá??á??á??á??á??á?¡ á?¡á??á??á??á??á??á??á??á?? á??á??á?ªá??á??á?¡ á?£á??á? á?£á??á??á??á??á?¡á??á?§á??á?¤á??á??, á??á??á? á?©á??á??á?? á?¨á??á??á? á?©á??á??á?? á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á??á??á??á?£á??á??á?¡á?®á??á??á??á?? á??á??á??á??á??á??á??á??á??á?? á? á??á??á??á??á??á??á??.
+securityLevel.learnMore = á??á?®á??á??á??á?? á??á? á?ªá??á??á??
+securityLevel.restoreDefaults = á??á??á??á?£á??á??á?¡á?®á??á??á??á??á?¡ á??á?¦á??á??á??á??á??
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 47b49321..ca4fa8b6 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "á??">
 <!ENTITY torbutton.context_menu.new_circuit "á??á?®á??á??á?? Tor-á?¬á? á??á??á?? á??á?? á?¡á??á??á?¢á??á?¡á??á??á??á?¡">
 <!ENTITY torbutton.context_menu.new_circuit_key "á?¬">
-<!ENTITY torbutton.context_menu.preferences "á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??">
-<!ENTITY torbutton.context_menu.preferences.key "á?£">
 <!ENTITY torbutton.context_menu.networksettings "Tor-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??...">
 <!ENTITY torbutton.context_menu.networksettings.key "á?¥">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor-á??á? á??á?£á??á??á? á??á?¡ á??á??á??á??á?®á??á??á??á??á??á??á?? á?¨á??á??á??á?¬á??á??á??á??...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "á?¤">
 <!ENTITY torbutton.button.tooltip "á??á??á??á?¬á??á??á??á??á?? Torbutton-á??á?¡ á??á??á?¡á??á?¨á??á??á??á??á??">
 <!ENTITY torbutton.prefs.security_settings "Tor-á??á? á??á?£á??á??á? á??á?¡ á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??">
-<!ENTITY torbutton.prefs.restore_defaults "á??á??á??á?£á??á??á?¡á?®á??á??á??á??á?¡ á??á?¦á??á??á??á??á??">
-<!ENTITY torbutton.prefs.custom_warning "á??á?¥á??á??á?? á??á??á??á?  á??á??á??á??á??á??á??á?£á??á?? á??á??á? á??á??á??á?¢á? á??á??á?? á??á? á??á?£á??á??á? á?¨á??, á??á? á??á?? á??á??á?¡á??á?¦á??á??á?? á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡á??á??á??á?¡. á??á??á? á??á??á?? á??á??á??á??á?ªá??á??á??á??á??á?¡ á?¡á??á??á??á??á??á??á??á?? á??á??á?ªá??á??á?¡ á?£á??á? á?£á??á??á??á??á?¡á??á?§á??á?¤á??á??, á??á??á? á?©á??á??á?? á?¨á??á??á? á?©á??á??á?? á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á??á??á??á?£á??á??á?¡á?®á??á??á??á?? á??á??á??á??á??á??á??á??á??á?? á? á??á??á??á??á??á??á??.">
 <!ENTITY torbutton.cookiedialog.title "á?¤á?£á??á??á?£á?¨á??á??á??á?¡ á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á??á??á? á??á??á??">
 <!ENTITY torbutton.cookiedialog.lockCol "á??á??á?ªá?£á??á??á??">
 <!ENTITY torbutton.cookiedialog.domainCol "á??á??á?¡á??á??á??á? á??á??">
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/kn/torbutton.dtd
+++ b/src/chrome/locale/kn/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ko/securityLevel.properties b/src/chrome/locale/ko/securityLevel.properties
new file mode 100644
index 00000000..bc5238d0
--- /dev/null
+++ b/src/chrome/locale/ko/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = ë³´ì?? ë?±ê¸?
+securityLevel.standard.level = í??ì¤?
+securityLevel.standard.summary = ëª¨ë?  Tor ë¸?ë?¼ì?°ì ?ì?? ì?¹ì?¬ì?´í?¸ì?? ê¸°ë?¥ë?¤ì?´ í??ì?±í?? ë?©ë??ë?¤.
+securityLevel.safer.level = ë?? ì??ì ?í?©ë??ë?¤
+securityLevel.safer.summary = ì?´ ì?¤ì ?ì?¼ë¡? í??í?? ì??í??í?? ì?¹ì?¬ì?´í?¸ì?? ê¸°ë?¥ì?´ ë¹?í??ì?±í??í??ë©´ ì?¼ë¶?ì?? ì?¬ì?´í?¸ì?? ê¸°ë?¥ë?¤ì?? ì?¬ì?© í?  ì?? ì??ì?µë??ë?¤.
+securityLevel.safer.description1 = JavaScriptê°? HTTPSì?? ì ?ì?©ë??ì§? ì??ì?? ì?¬ì?´í?¸ì??ì?? ë¹?í??ì?±í?? ë?©ë??ë?¤.
+securityLevel.safer.description2 = ì?¼ë¶? ê¸?ê¼´ì?´ë©° ì??í??ê¸°í?¸ê°? ë¹?í??ì?±í?? ë?©ë??ë?¤.
+securityLevel.safer.description3 = ì?¤ë??ì?¤ì?? ë??ì??ì??(HTML5 media) ë³´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤.
+securityLevel.safest.level = ì ?ì?¼ ì??ì ?í?©ë??ë?¤
+securityLevel.safest.summary = ì ?ì ? ì?¬ì?´í?¸ì?? ê¸°ë³¸ ì??ë¹?ì?¤ì?? í??ì??í?? ê¸°ë?¥ì?´ë§? ì?©ë?¨í?©ë??ë?¤. ê·¸ ë³?ê²½ë?¤ì?? ì?¬ì§?ì?´ë©° ë©?ë??ì??ë©° ì?¤í?¬ë¦½í?¸ë¥¼ ì??í?¥í?  ê²?ì??ë??ë?¤.
+securityLevel.safest.description1 = ì??ë°? ì?¤í?¬ë¦½í?¸ë?? ê¸°ë³¸ ì?¤ì ?ì?¼ë¡? ëª¨ë?  ì?¬ì?´í?¸ì??ì?? ë¹?í??ì?±í?? ë??ì?´ ì??ì?µë??ë?¤.
+securityLevel.safest.description2 = ì?¼ë¶? ê¸?ê¼´ì?´ë©° ì??ì§?ì?´ë©° ì??í??ê¸°í?¸ë©° ì?¬ì§?ì?´ ë¹?í??ì?±í?? ë?©ë??ë?¤.
+securityLevel.safest.description3 = ì?¤ë??ì?¤ì?? ë??ì??ì??(HTML5 media) ë³´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤.
+securityLevel.custom.summary = ì?¬ì?©ì?? ì§?ì ? ë¸?ë?¼ì?°ì ? ê¸°ë³¸ ì?¤ì ?ì?¼ë¡? ì?¸í?´ ë¹?ì ?ì??ì ?ì?¸ ë³´ì?? ì?¤ì ?ì?´ ë°?ì??í??ì?µë??ë?¤. ë³´ì?? ë°? ê°?ì?¸ ì ?ë³´ ë³´í?¸ë¥¼ ì??í?´ ê¸°ë³¸ ë³´ì?? ì??ì¤? ì¤? í??ë??ë¥¼ ì? í??í??ë?? ê²?ì?´ ì¢?ì?µë??ë?¤.
+securityLevel.learnMore = ë?? ì??ì??ë³´ê¸°
+securityLevel.restoreDefaults = ê¸°ë³¸ê°?ì?¼ë¡? ë³µêµ¬
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index ab359411..03dfc033 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Tor ì??í?· ì?¬êµ¬ì¶?">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ë³´ì?? ì?¤ì ?...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "í? ë¥´ ë?¤í?¸ì??í?¬ ì?¤ì ?...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "í? ë¥´ ë¸?ë?¼ì?°ì ? ì??ë?°ì?´í?¸ ì²´í?¬í??ê¸°...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton ì?¤ì ? ì´?ê¸°í??">
 <!ENTITY torbutton.prefs.security_settings "Tor ë¸?ë?¼ì?°ì ? ë³´ì?? ì?¤ì ?">
-<!ENTITY torbutton.prefs.restore_defaults "ê¸°ë³¸ê°?ì?¼ë¡? ë³µêµ¬">
-<!ENTITY torbutton.prefs.custom_warning "ì?¬ì?©ì?? ì§?ì ? ë¸?ë?¼ì?°ì ? ê¸°ë³¸ ì?¤ì ?ì?¼ë¡? ì?¸í?´ ë¹?ì ?ì??ì ?ì?¸ ë³´ì?? ì?¤ì ?ì?´ ë°?ì??í??ì?µë??ë?¤. ë³´ì?? ë°? ê°?ì?¸ ì ?ë³´ ë³´í?¸ë¥¼ ì??í?´ ê¸°ë³¸ ë³´ì?? ì??ì¤? ì¤? í??ë??ë¥¼ ì? í??í??ë?? ê²?ì?´ ì¢?ì?µë??ë?¤.">
 <!ENTITY torbutton.cookiedialog.title "ì¿ í?¤ ë³´í?¸ ê´?ë¦¬">
 <!ENTITY torbutton.cookiedialog.lockCol "ë³´í?¸ë?¨">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/kw/torbutton.dtd
+++ b/src/chrome/locale/kw/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd
index 8be58090..5fe03c20 100644
--- a/src/chrome/locale/ky/torbutton.dtd
+++ b/src/chrome/locale/ky/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/lb/torbutton.dtd
+++ b/src/chrome/locale/lb/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd
index ee8c0d28..a8e1fe51 100644
--- a/src/chrome/locale/lg/torbutton.dtd
+++ b/src/chrome/locale/lg/torbutton.dtd
@@ -1,7 +1,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ln/torbutton.dtd
+++ b/src/chrome/locale/ln/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/lo/torbutton.dtd
+++ b/src/chrome/locale/lo/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/lt/securityLevel.properties b/src/chrome/locale/lt/securityLevel.properties
new file mode 100644
index 00000000..92fcf4b1
--- /dev/null
+++ b/src/chrome/locale/lt/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Atstatyti numatytuosius
diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd
index 85e41b2d..6cf6f9ca 100644
--- a/src/chrome/locale/lt/torbutton.dtd
+++ b/src/chrome/locale/lt/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "SlapukÅ³ apsaugos">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Paspauskite kad aktyvuoti Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Atstatyti numatytuosius">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/lv/securityLevel.properties b/src/chrome/locale/lv/securityLevel.properties
new file mode 100644
index 00000000..f3d2eab9
--- /dev/null
+++ b/src/chrome/locale/lv/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Atjaunot noklusÄ?juma vÄ?rtÄ«bas
diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd
index ea5e250b..2b52a966 100644
--- a/src/chrome/locale/lv/torbutton.dtd
+++ b/src/chrome/locale/lv/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "AizsardzÄ«ba no sÄ«kdatnÄ?m">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "NoklikÅ¡Ä·inÄ?t, lai inicializÄ?tu Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Atjaunot noklusÄ?juma vÄ?rtÄ«bas">
 <!ENTITY torbutton.cookiedialog.title "PÄ?rvaldÄ«t aizsardzÄ«bu no sÄ«kdatnÄ?m">
 <!ENTITY torbutton.cookiedialog.lockCol "AizsargÄ?ts">
 <!ENTITY torbutton.cookiedialog.domainCol "ViesotÄ?js">
diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/mg/torbutton.dtd
+++ b/src/chrome/locale/mg/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/mi/torbutton.dtd
+++ b/src/chrome/locale/mi/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/mk/securityLevel.properties b/src/chrome/locale/mk/securityLevel.properties
new file mode 100644
index 00000000..b6ceb35c
--- /dev/null
+++ b/src/chrome/locale/mk/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°
diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd
index 28cfc0b8..cc240827 100644
--- a/src/chrome/locale/mk/torbutton.dtd
+++ b/src/chrome/locale/mk/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ð?Ð»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð·Ð° Ð¸Ð½Ð¸Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð½Ð° Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ml/torbutton.dtd
+++ b/src/chrome/locale/ml/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/mn/torbutton.dtd
+++ b/src/chrome/locale/mn/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/mr/torbutton.dtd
+++ b/src/chrome/locale/mr/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ms/torbutton.dtd
+++ b/src/chrome/locale/ms/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/my/securityLevel.properties b/src/chrome/locale/my/securityLevel.properties
new file mode 100644
index 00000000..69808509
--- /dev/null
+++ b/src/chrome/locale/my/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults =  á??á?°á??á?¡á??á?á?¯á??á?ºá?¸ á??á?¼á??á?ºá??á?¬á?¸á??á??á?º
diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd
index b628fd23..06bc4078 100644
--- a/src/chrome/locale/my/torbutton.dtd
+++ b/src/chrome/locale/my/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "á??á?½á??á?ºá??á?®á?¸ á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton á??á?á?¯ á?¡á??á??á?¼á?¯á??á??á?º á??á?¾á?á??á?ºá??á?«á??">
-<!ENTITY torbutton.prefs.restore_defaults " á??á?°á??á?¡á??á?á?¯á??á?ºá?¸ á??á?¼á??á?ºá??á?¬á?¸á??á??á?º">
 <!ENTITY torbutton.cookiedialog.title "á??á?½á??á?ºá??á?®á?¸ á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?á?¯ á??á?®á??á?¶á??á??á?ºá?·á??á?½á?²á??á??á?º">
 <!ENTITY torbutton.cookiedialog.lockCol "á?¡á??á?¬á?¡á??á?½á??á?º á??á?¯á??á?ºá??á?¬á?¸á??á??á?º">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/nah/torbutton.dtd
+++ b/src/chrome/locale/nah/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/nap/torbutton.dtd
+++ b/src/chrome/locale/nap/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/nb/securityLevel.properties b/src/chrome/locale/nb/securityLevel.properties
new file mode 100644
index 00000000..8b36964f
--- /dev/null
+++ b/src/chrome/locale/nb/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = SikkerhetsnivÃ¥
+securityLevel.standard.level = Forvalg
+securityLevel.standard.summary = Alle Tor-nettleser- og nettside-funksjoner er pÃ¥.
+securityLevel.safer.level = Tryggere
+securityLevel.safer.summary = Skrur av nettsidefunksjoner som ofte er farlige, som gjÃ¸r at noen sider blir skadelidende.
+securityLevel.safer.description1 = JavaScript er avskrudd pÃ¥ sider som ikke er HTTPS.
+securityLevel.safer.description2 = Noen skrifter og mattesymboler er avskrudd.
+securityLevel.safer.description3 = Lyd og video (HTML5-media) mÃ¥ klikkes for Ã¥ spilles av.
+securityLevel.safest.level = Tryggest
+securityLevel.safest.summary = Tillater bare nettsidefunksjoner som kreves for statiske sider og grunnleggende tjenester. Disse endringene har innvirkning pÃ¥ bilder, media, og skript.
+securityLevel.safest.description1 = JavaScript er som forvalg slÃ¥tt av for alle nettsteder.
+securityLevel.safest.description2 = Noen skrifter, ikoner, mattesymboler og bilder er avskrudd.
+securityLevel.safest.description3 = Lyd og video (HTML5-media) mÃ¥ klikkes for Ã¥ spilles av.
+securityLevel.custom.summary = Dine nettleserinnstillinger har fÃ¸rt med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivÃ¥ene.
+securityLevel.learnMore = LÃ¦r mer
+securityLevel.restoreDefaults = Gjenopprett forvalg
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 67e2fc2b..be9665d5 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets for denne siden">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Sikkerhetsinnstillingerâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Nettverksinnstillinger for Torâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for Tor-nettleserenâ?¦">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klikk for Ã¥ igangsette Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Sikkerhetsinnstillinger for Tor-nettleseren">
-<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett forvalg">
-<!ENTITY torbutton.prefs.custom_warning "Dine nettleserinnstillinger har fÃ¸rt med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivÃ¥ene.">
 <!ENTITY torbutton.cookiedialog.title "Administrer beskyttelse av informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "Vert">
diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ne/torbutton.dtd
+++ b/src/chrome/locale/ne/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/nl/securityLevel.properties b/src/chrome/locale/nl/securityLevel.properties
new file mode 100644
index 00000000..2410b725
--- /dev/null
+++ b/src/chrome/locale/nl/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Beveiligingsniveau
+securityLevel.standard.level = Standaard
+securityLevel.standard.summary = Alle Tor Browser- en websitefuncties zijn ingeschakeld.
+securityLevel.safer.level = Veiliger
+securityLevel.safer.summary = Uitgeschakelde websitefuncties die zijn meestal gevaarlijk, waardoor sommige sites functionaliteit vaak verliezen.
+securityLevel.safer.description1 = JavaScript zijn uitgeschakeld op non-HTTP sites.
+securityLevel.safer.description2 = Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld.
+securityLevel.safer.description3 = Audio en video (HTML5-media) zijn klik-bij-afspelen.
+securityLevel.safest.level = Veiligste
+securityLevel.safest.summary = Alleen websitefuncties toestaan die vereist zijn voor statische sites en basis diensten. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts.
+securityLevel.safest.description1 = Javascript zijn standaard uitgeschakeld op alle sites.
+securityLevel.safest.description2 = Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld.
+securityLevel.safest.description3 = Audio en video (HTML5-media) zijn klik-bij-afspelen.
+securityLevel.custom.summary = Je aangepaste browservoorkeuren hebben geleid tot ongebruikelijke beveiligingsinstellingen. Uit veiligheids- en privacy-overwegingen raden we je aan Ã©Ã©n van de standaardbeveiligingsniveaus te kiezen.
+securityLevel.learnMore = Leer Meer
+securityLevel.restoreDefaults = Standaardwaarden herstellen
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index d31b4153..0ab3164b 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nieuw Tor-circuit voor deze website">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Beveiligingsinstellingenâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor-netwerkinstellingenâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor-browser...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klik hier om Tor-knop te initialiseren">
 <!ENTITY torbutton.prefs.security_settings "Tor-browser Beveiligingsinstellingen">
-<!ENTITY torbutton.prefs.restore_defaults "Standaardwaarden herstellen">
-<!ENTITY torbutton.prefs.custom_warning "Je aangepaste browservoorkeuren hebben geleid tot ongebruikelijke beveiligingsinstellingen. Uit veiligheids- en privacy-overwegingen raden we je aan Ã©Ã©n van de standaardbeveiligingsniveaus te kiezen.">
 <!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen">
 <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/nn/torbutton.dtd
+++ b/src/chrome/locale/nn/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/nso/torbutton.dtd
+++ b/src/chrome/locale/nso/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/oc/torbutton.dtd
+++ b/src/chrome/locale/oc/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/or/torbutton.dtd
+++ b/src/chrome/locale/or/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index c7185f22..2ff04d9a 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/pap/torbutton.dtd
+++ b/src/chrome/locale/pap/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/pl/securityLevel.properties b/src/chrome/locale/pl/securityLevel.properties
new file mode 100644
index 00000000..0b5e04da
--- /dev/null
+++ b/src/chrome/locale/pl/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Poziom bezpieczeÅ?stwa
+securityLevel.standard.level = Standardowy
+securityLevel.standard.summary = Wszystkie funkcje PrzeglÄ?darki Tor i strony zostaÅ?y wÅ?Ä?czone.
+securityLevel.safer.level = Bezpieczniej
+securityLevel.safer.summary = WyÅ?Ä?cza funkcje witryny, ktÃ³re czÄ?sto sÄ? niebezpieczne, co powoduje, Å¼e niektÃ³re witryny tracÄ? funkcjonalnoÅ?Ä?.
+securityLevel.safer.description1 = ObsÅ?uga skryptÃ³w Java na stronach bez HTTPS jest wyÅ?Ä?czona.
+securityLevel.safer.description2 = NiektÃ³re fonty i symbole sÄ? wyÅ?Ä?czone.
+securityLevel.safer.description3 = DÅºwiÄ?k i obraz (media HTML5) to &quot;kliknij, aby odtworzyÄ?&quot;.
+securityLevel.safest.level = Najbezpieczniejszy
+securityLevel.safest.summary = Pozwala tylko na funkcje serwisu wymagane w przypadku witryn statycznych i podstawowych usÅ?ug. Te zmiany dotyczÄ? obrazÃ³w, multimediÃ³w i skryptÃ³w.
+securityLevel.safest.description1 = JavaScript jest domyÅ?lnie wyÅ?Ä?czona na wszystkich stronach.
+securityLevel.safest.description2 = NiektÃ³re fonty, ikony, symbole i obrazki sÄ? wyÅ?Ä?czone.
+securityLevel.safest.description3 = DÅºwiÄ?k i obraz (media HTML5) to &quot;kliknij, aby odtworzyÄ?&quot;.
+securityLevel.custom.summary = Niestandardowe preferencje przeglÄ?darki spowodowaÅ?y nietypowe ustawienia zabezpieczeÅ?. Ze wzglÄ?dÃ³w bezpieczeÅ?stwa i prywatnoÅ?ci zalecamy wybranie jednego z domyÅ?lnych poziomÃ³w zabezpieczeÅ?.
+securityLevel.learnMore = Dowiedz siÄ? wiÄ?cej
+securityLevel.restoreDefaults = PrzywrÃ³Ä? domyÅ?lne
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index ba43142b..134b01fe 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "o">
 <!ENTITY torbutton.context_menu.new_circuit "Nowy obwÃ³d dla tej strony">
 <!ENTITY torbutton.context_menu.new_circuit_key "c">
-<!ENTITY torbutton.context_menu.preferences "Ustawienia bezpieczeÅ?stwa...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ustawienia Sieci Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "SprawdÅº czy sÄ? aktualizacje Tor Browser...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "c">
 <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomiÄ? Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Ustawienia BezpieczeÅ?stwa PrzeglÄ?darki Tor">
-<!ENTITY torbutton.prefs.restore_defaults "PrzywrÃ³Ä? domyÅ?lne">
-<!ENTITY torbutton.prefs.custom_warning "Niestandardowe preferencje przeglÄ?darki spowodowaÅ?y nietypowe ustawienia zabezpieczeÅ?. Ze wzglÄ?dÃ³w bezpieczeÅ?stwa i prywatnoÅ?ci zalecamy wybranie jednego z domyÅ?lnych poziomÃ³w zabezpieczeÅ?.">
 <!ENTITY torbutton.cookiedialog.title "ZarzÄ?dzaj ochronÄ? ciasteczek">
 <!ENTITY torbutton.cookiedialog.lockCol "Chronione">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/pms/torbutton.dtd
+++ b/src/chrome/locale/pms/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ps/torbutton.dtd
+++ b/src/chrome/locale/ps/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/pt-BR/securityLevel.properties b/src/chrome/locale/pt-BR/securityLevel.properties
new file mode 100644
index 00000000..5ad5d318
--- /dev/null
+++ b/src/chrome/locale/pt-BR/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = NÃvel de SeguranÃ§a
+securityLevel.standard.level = PadrÃ£o
+securityLevel.standard.summary = Todos os recursos do Navegador Tor e do website estÃ£o ativos.
+securityLevel.safer.level = Seguro
+securityLevel.safer.summary = Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade.
+securityLevel.safer.description1 = JavaScript estÃ¡ desativado em todos os sites sem HTTPS.
+securityLevel.safer.description2 = Algumas fontes e sÃmbolos matemÃ¡ticos estÃ£o desativados.
+securityLevel.safer.description3 = Clicar para tocar ou ver Ã¡udio ou vÃdeo (mÃdia HTML5).
+securityLevel.safest.level = SeguranÃ§a mÃ¡xima
+securityLevel.safest.summary = Apenas permitir os recursos dos websites necessÃ¡rios para sites estÃ¡ticos e serviÃ§os bÃ¡sicos. Essas mudanÃ§as afetam imagens, mÃdias e scripts.
+securityLevel.safest.description1 = JavaScript estÃ¡ desativado por padrÃ£o em todos os sites.
+securityLevel.safest.description2 = Algumas fontes, Ãcones, sÃmbolos matemÃ¡ticas e imagens estÃ£o desativadas.
+securityLevel.safest.description3 = Clicar para tocar ou ver Ã¡udio ou vÃdeo (mÃdia HTML5).
+securityLevel.custom.summary = As configuraÃ§Ãµes personalizadas do seu navegador ficaram fora do comum. Por razÃµes de seguranÃ§a e de privacidade, recomendamos que vocÃª escolha um dos nÃveis padrÃµes de seguranÃ§a.
+securityLevel.learnMore = Aprenda mais
+securityLevel.restoreDefaults = Restaurar PadrÃµes
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 5ca71899..cf4026bd 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Eu">
 <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ConfiguraÃ§Ãµes de SeguranÃ§a...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ConfiguraÃ§Ãµes da Rede Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Procurar AtualizaÃ§Ãµes do Navegador Tor...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton">
 <!ENTITY torbutton.prefs.security_settings "ConfiguraÃ§Ãµes de SeguranÃ§a do Navegador Tor">
-<!ENTITY torbutton.prefs.restore_defaults "Restaurar PadrÃµes">
-<!ENTITY torbutton.prefs.custom_warning "As configuraÃ§Ãµes personalizadas do seu navegador ficaram fora do comum. Por razÃµes de seguranÃ§a e de privacidade, recomendamos que vocÃª escolha um dos nÃveis padrÃµes de seguranÃ§a. ">
 <!ENTITY torbutton.cookiedialog.title "Gerenciar ProteÃ§Ãµes de Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
diff --git a/src/chrome/locale/pt/securityLevel.properties b/src/chrome/locale/pt/securityLevel.properties
new file mode 100644
index 00000000..1c8fdfe2
--- /dev/null
+++ b/src/chrome/locale/pt/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.securityLevel = NÃvel de SeguranÃ§a
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index efff3d9b..24c8df67 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ConfiguraÃ§Ãµes da Rede Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Procurar por atualizaÃ§Ãµes do Navegador Tor...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
 <!ENTITY torbutton.cookiedialog.title "Gerir ProteÃ§Ãµes dos Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
diff --git a/src/chrome/locale/ro/securityLevel.properties b/src/chrome/locale/ro/securityLevel.properties
new file mode 100644
index 00000000..52d4889f
--- /dev/null
+++ b/src/chrome/locale/ro/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = RestaureazÄ? setÄ?rile implicite
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 8bbcaf85..9a9f85fe 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Protectii Cookie-uri.">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "ApasÄ? pentru pornirea Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "RestaureazÄ? setÄ?rile implicite">
 <!ENTITY torbutton.cookiedialog.title "GestioneazÄ? ProtecÅ£ii Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protejat">
 <!ENTITY torbutton.cookiedialog.domainCol "Gazda">
diff --git a/src/chrome/locale/ru/securityLevel.properties b/src/chrome/locale/ru/securityLevel.properties
new file mode 100644
index 00000000..ed2685d8
--- /dev/null
+++ b/src/chrome/locale/ru/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Ð£Ñ?Ð¾Ð²ÐµÐ½Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸
+securityLevel.standard.level = Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ðµ
+securityLevel.standard.summary = Ð?Ñ?Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Tor Browser Ð¸ Ð²ÐµÐ±-Ñ?Ð°Ð¹Ñ?Ð¾Ð² Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.
+securityLevel.safer.level = Ð?Ð¾Ð»ÐµÐµ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ñ?Ðµ
+securityLevel.safer.summary = Ð?Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ? Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð²ÐµÐ±-Ñ?Ð°Ð¹Ñ?Ð¾Ð², ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¾ Ð±Ñ?Ð²Ð°Ñ?Ñ? Ð¾Ð¿Ð°Ñ?Ð½Ñ?, Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ñ?Ð¸Ð²ÐµÑ?Ñ?Ð¸ Ðº Ð¿Ð¾Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð°Ð»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ð¼Ð¸ Ñ?Ð°Ð¹Ñ?Ð°Ð¼Ð¸.
+securityLevel.safer.description1 =  JavaScript Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½ Ð½Ð° Ð²Ñ?ÐµÑ? Ð½Ðµ HTTPS Ñ?Ð°Ð¹Ñ?Ð°Ñ?.
+securityLevel.safer.description2 = Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ñ?Ñ? Ð¸ Ð¼Ð°Ñ?ÐµÐ¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.
+securityLevel.safer.description3 = Ð?Ñ?Ð´Ð¸Ð¾ Ð¸ Ð²Ð¸Ð´ÐµÐ¾ (HTML5 Ð¼ÐµÐ´Ð¸Ð°) Ð¿Ñ?Ð¾Ð¸Ð³Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¿Ð¾Ñ?Ð»Ðµ ÐºÐ»Ð¸ÐºÐ°.
+securityLevel.safest.level = Ð?Ð°Ð¸Ð±Ð¾Ð»ÐµÐµ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ñ?Ðµ
+securityLevel.safest.summary = Ð Ð°Ð·Ñ?ÐµÑ?ÐµÐ½Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð²ÐµÐ±-Ñ?Ð°Ð¹Ñ?Ð¾Ð², Ñ?Ñ?ÐµÐ±Ñ?Ñ?Ñ?Ð¸ÐµÑ?Ñ? Ð´Ð»Ñ? Ñ?Ñ?Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ñ? Ñ?Ð°Ð¹Ñ?Ð¾Ð² Ð¸ Ð¾Ñ?Ð½Ð¾Ð²Ð½Ñ?Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð². ÐÑ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð²Ð»Ð¸Ñ?Ñ?Ñ? Ð½Ð° Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?, Ð¼ÐµÐ´Ð¸Ð° Ð¸ Ñ?ÐºÑ?Ð¸Ð¿Ñ?Ñ?.
+securityLevel.safest.description1 = JavaScript Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ð½Ð° Ð²Ñ?ÐµÑ? Ñ?Ð°Ð¹Ñ?Ð°Ñ?.
+securityLevel.safest.description2 = Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?, Ð·Ð½Ð°Ñ?ÐºÐ¸, Ð¼Ð°Ñ?ÐµÐ¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ñ? Ð¸ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ?.
+securityLevel.safest.description3 = Ð?Ñ?Ð´Ð¸Ð¾ Ð¸ Ð²Ð¸Ð´ÐµÐ¾ (HTML5 Ð¼ÐµÐ´Ð¸Ð°) Ð¿Ñ?Ð¾Ð¸Ð³Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¿Ð¾Ñ?Ð»Ðµ ÐºÐ»Ð¸ÐºÐ°.
+securityLevel.custom.summary = Ð?Ð°Ñ?Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Ð¿Ñ?Ð¸Ð²ÐµÐ»Ð¸ Ðº Ð½ÐµÐ¾Ð±Ñ?Ñ?Ð½Ñ?Ð¼ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð°Ð¼ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸. Ð?Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?Ð¼ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¸ Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¼Ñ? Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÐ¼ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ñ?Ñ?Ð¾Ð²Ð½ÐµÐ¹ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?.
+securityLevel.learnMore = Ð?Ð¾Ð´Ñ?Ð¾Ð±Ð½ÐµÐµ
+securityLevel.restoreDefaults = Ð?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 3acf77f4..bbf416a4 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Ð¯">
 <!ENTITY torbutton.context_menu.new_circuit "Ð?Ð¾Ð²Ð°Ñ? Ñ?ÐµÐ¿Ð¾Ñ?ÐºÐ° Tor Ð´Ð»Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ cÐ°Ð¹Ñ?Ð°">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ñ?ÐµÑ?Ð¸ Tor">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð½Ð° Ð½Ð°Ð»Ð¸Ñ?Ð¸Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Tor Browser">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Tor Browser">
-<!ENTITY torbutton.prefs.restore_defaults "Ð?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?">
-<!ENTITY torbutton.prefs.custom_warning "Ð?Ð°Ñ?Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Ð¿Ñ?Ð¸Ð²ÐµÐ»Ð¸ Ðº Ð½ÐµÐ¾Ð±Ñ?Ñ?Ð½Ñ?Ð¼ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð°Ð¼ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸. Ð?Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?Ð¼ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¸ Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¼Ñ? Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÐ¼ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ñ?Ñ?Ð¾Ð²Ð½ÐµÐ¹ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?.">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ð¾Ð¹ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ð¾Ð²">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð?ÐµÐ´Ñ?Ñ?Ð¸Ð¹ Ñ?Ð·ÐµÐ»">
diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/sco/torbutton.dtd
+++ b/src/chrome/locale/sco/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/sk/securityLevel.properties b/src/chrome/locale/sk/securityLevel.properties
new file mode 100644
index 00000000..e0a3a746
--- /dev/null
+++ b/src/chrome/locale/sk/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = ObnoviÅ¥ predvolenÃ©
diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd
index 25dc5886..f4e7ad73 100644
--- a/src/chrome/locale/sk/torbutton.dtd
+++ b/src/chrome/locale/sk/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "ObnoviÅ¥ predvolenÃ©">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/sl/securityLevel.properties b/src/chrome/locale/sl/securityLevel.properties
new file mode 100644
index 00000000..4418f738
--- /dev/null
+++ b/src/chrome/locale/sl/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Privzete nastavitve
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 475724e3..f3243f95 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "piÅ¡kotkina zaÅ¡Ä?ita">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razÅ¡iritve Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Privzete nastavitve">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/so/torbutton.dtd
+++ b/src/chrome/locale/so/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/son/torbutton.dtd
+++ b/src/chrome/locale/son/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 0f77148b..9d2ddd42 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/sr/securityLevel.properties b/src/chrome/locale/sr/securityLevel.properties
new file mode 100644
index 00000000..57f1ebf1
--- /dev/null
+++ b/src/chrome/locale/sr/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Ð?Ð¾Ð²Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾
diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd
index a945b001..dd24b25c 100644
--- a/src/chrome/locale/sr/torbutton.dtd
+++ b/src/chrome/locale/sr/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð¾Ð·Ð²Ð¾Ð»Ðµ Ð·Ð° ÐºÐ¾Ð»Ð°Ñ?Ð¸Ñ?Ðµ">
 <!ENTITY torbutton.context_menu.cookieProtections.key "Ð¦">
 <!ENTITY torbutton.button.tooltip "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ð»Ð¸ Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Ð?Ð¾Ð²Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ñ?ÐµÐ´Ð¸ Ð·Ð°Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð»Ð°Ñ?Ð¸Ñ?Ð°">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/st/torbutton.dtd
+++ b/src/chrome/locale/st/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/su/torbutton.dtd
+++ b/src/chrome/locale/su/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/sv/securityLevel.properties b/src/chrome/locale/sv/securityLevel.properties
new file mode 100644
index 00000000..8a51da05
--- /dev/null
+++ b/src/chrome/locale/sv/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = SÃ¤kerhetsnivÃ¥
+securityLevel.standard.level = Standard
+securityLevel.standard.summary = Alla funktioner fÃ¶r Tor Browser och webbplatsfunktioner Ã¤r aktiverade.
+securityLevel.safer.level = SÃ¤krare
+securityLevel.safer.summary = Inaktiverar webbplatsfunktioner som ofta Ã¤r farliga, vilket gÃ¶r att vissa webbplatser fÃ¶rlorar funktionalitet.
+securityLevel.safer.description1 = JavaScript Ã¤r inaktiverat pÃ¥ webbplatser utan HTTPS.
+securityLevel.safer.description2 = Vissa typsnitt och matte symboler Ã¤r inaktiverade.
+securityLevel.safer.description3 = Ljud och video (HTML5-media) Ã¤r klicka-fÃ¶r-att-spel.
+securityLevel.safest.level = SÃ¤krast
+securityLevel.safest.summary = TillÃ¥t endast webbplatsfunktioner som krÃ¤vs fÃ¶r statiska webbplatser och grundlÃ¤ggande tjÃ¤nster. Dessa fÃ¶rÃ¤ndringar pÃ¥verkar bilder, media och skript.
+securityLevel.safest.description1 = JavaScript Ã¤r inaktiverat som standard pÃ¥ alla webbplatser.
+securityLevel.safest.description2 = Vissa typsnitt, ikoner, matte symboler och bilder Ã¤r inaktiverade.
+securityLevel.safest.description3 = Ljud och video (HTML5-media) Ã¤r klicka-fÃ¶r-att-spel.
+securityLevel.custom.summary = Dina anpassade webblÃ¤sarinstÃ¤llningar har resulterat i ovanliga sÃ¤kerhetsinstÃ¤llningar. Av sÃ¤kerhets- och integritetsskÃ¤l rekommenderar vi att du anvÃ¤nder en av de fÃ¶rdefinierade sÃ¤kerhetsnivÃ¥erna.
+securityLevel.learnMore = LÃ¤s mer
+securityLevel.restoreDefaults = Ã?terstÃ¤ll standard
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index d05c163e..5c074a65 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets fÃ¶r den hÃ¤r webbplatsen">
 <!ENTITY torbutton.context_menu.new_circuit_key "S">
-<!ENTITY torbutton.context_menu.preferences "SÃ¤kerhetsinstÃ¤llningar...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor-nÃ¤tverksinstÃ¤llningar...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "SÃ¶k efter uppdateringar fÃ¶r Tor Browser...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "S">
 <!ENTITY torbutton.button.tooltip "Klicka fÃ¶r att initialisera Torbutton">
 <!ENTITY torbutton.prefs.security_settings "SÃ¤kerhetsinstÃ¤llningar i Tor Browser">
-<!ENTITY torbutton.prefs.restore_defaults "Ã?terstÃ¤ll standard">
-<!ENTITY torbutton.prefs.custom_warning "Dina anpassade webblÃ¤sarinstÃ¤llningar har resulterat i ovanliga sÃ¤kerhetsinstÃ¤llningar. Av sÃ¤kerhets- och integritetsskÃ¤l rekommenderar vi att du anvÃ¤nder en av de fÃ¶rdefinierade sÃ¤kerhetsnivÃ¥erna.">
 <!ENTITY torbutton.cookiedialog.title "Hantera Cookies skydd">
 <!ENTITY torbutton.cookiedialog.lockCol "Skyddad">
 <!ENTITY torbutton.cookiedialog.domainCol "VÃ¤rd">
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ta/torbutton.dtd
+++ b/src/chrome/locale/ta/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/te/torbutton.dtd
+++ b/src/chrome/locale/te/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/tg/torbutton.dtd
+++ b/src/chrome/locale/tg/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 4f4b87fd..e0da4be2 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ti/torbutton.dtd
+++ b/src/chrome/locale/ti/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/tk/torbutton.dtd
+++ b/src/chrome/locale/tk/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/tr/securityLevel.properties b/src/chrome/locale/tr/securityLevel.properties
new file mode 100644
index 00000000..45ca83be
--- /dev/null
+++ b/src/chrome/locale/tr/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = GÃ¼venlik DÃ¼zeyi
+securityLevel.standard.level = Standart
+securityLevel.standard.summary = TÃ¼m Tor Browser ve web sitesi Ã¶zellikleri kullanÄ±labilir.
+securityLevel.safer.level = Daha GÃ¼venli
+securityLevel.safer.summary = SÄ±klÄ±kla tehlikeli olan web sitesi Ã¶zellikleri devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r ve bazÄ± sitelerin iÅ?levlerinde kayÄ±plar olabilir.
+securityLevel.safer.description1 = JavaScript, HTTPS kullanmayan sitelerde devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.
+securityLevel.safer.description2 = BazÄ± yazÄ± tÃ¼rleri ve matematik simgeleri devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.
+securityLevel.safer.description3 = Ses ve gÃ¶rÃ¼ntÃ¼ler (HTML5 ortamÄ±) tÄ±klayarak Ã§alÄ±Å?tÄ±rÄ±labilir.
+securityLevel.safest.level = En GÃ¼venli
+securityLevel.safest.summary = YalnÄ±z duraÄ?an siteler ve temel hizmetler iÃ§in gerekli web sitesi Ã¶zelliklerine izin verilir. Bu deÄ?iÅ?iklikler gÃ¶rselleri, ortamlarÄ± ve betikleri etkiler.
+securityLevel.safest.description1 = JavaScript betikleri tÃ¼m sitelerde varsayÄ±lan olarak devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.
+securityLevel.safest.description2 = BazÄ± yazÄ± tÃ¼rleri, simgeler, matematik simgeleri ve gÃ¶rseller devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r.
+securityLevel.safest.description3 = Ses ve gÃ¶rÃ¼ntÃ¼ler (HTML5 ortamÄ±) tÄ±klayarak Ã§alÄ±Å?tÄ±rÄ±labilir.
+securityLevel.custom.summary = TarayÄ±cÄ±nÄ±z standart olmayan Ã¶zel gÃ¼venlik ayarlarÄ± kullanÄ±yor. GÃ¼venlik ve gizlilik nedenleriyle aÅ?aÄ?Ä±daki varsayÄ±lan gÃ¼venlik ayarÄ± dÃ¼zeylerinden birini seÃ§meniz Ã¶nerilir.
+securityLevel.learnMore = AyrÄ±ntÄ±lÄ± bilgi alÄ±n
+securityLevel.restoreDefaults = VarsayÄ±lanlara SÄ±fÄ±rla
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 24b3dfff..e6be6713 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Bu Sitenin Tor Devresini Yenile">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "GÃ¼venlik AyarlarÄ±...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor AÄ? AyarlarÄ±...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser GÃ¼ncelleme Denetimi...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton uygulamasÄ±nÄ± baÅ?latmak iÃ§in tÄ±klayÄ±n">
 <!ENTITY torbutton.prefs.security_settings "Tor Browser GÃ¼venlik AyarlarÄ±">
-<!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lanlara SÄ±fÄ±rla">
-<!ENTITY torbutton.prefs.custom_warning "TarayÄ±cÄ±nÄ±z standart olmayan Ã¶zel gÃ¼venlik ayarlarÄ± kullanÄ±yor. GÃ¼venlik ve gizlilik nedenleriyle aÅ?aÄ?Ä±daki varsayÄ±lan gÃ¼venlik ayarÄ± dÃ¼zeylerinden birini seÃ§meniz Ã¶nerilir.">
 <!ENTITY torbutton.cookiedialog.title "Ã?erez KorumasÄ± YÃ¶netimi">
 <!ENTITY torbutton.cookiedialog.lockCol "KorunmuÅ?">
 <!ENTITY torbutton.cookiedialog.domainCol "Sunucu">
diff --git a/src/chrome/locale/uk/securityLevel.properties b/src/chrome/locale/uk/securityLevel.properties
new file mode 100644
index 00000000..0148214f
--- /dev/null
+++ b/src/chrome/locale/uk/securityLevel.properties
@@ -0,0 +1 @@
+securityLevel.restoreDefaults = Ð?Ð° Ð?Ð°Ð¼Ð¾Ð²Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?Ð¼
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 742060f9..1a746b53 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð°Ñ?Ð¸Ñ?Ñ? ÐºÑ?ÐºÐ¸">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ð?Ð»Ð°Ñ?Ð½Ñ?Ñ?Ñ? Ð´Ð»Ñ? Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ? Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Ð?Ð° Ð?Ð°Ð¼Ð¾Ð²Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?Ð¼">
 <!ENTITY torbutton.cookiedialog.title "Ð?ÐµÑ?Ñ?Ð²Ð°Ñ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð¼ Ð?Ñ?ÐºÑ?Ð²">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð¥Ð¾Ñ?Ñ?">
diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ur/torbutton.dtd
+++ b/src/chrome/locale/ur/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/ve/torbutton.dtd
+++ b/src/chrome/locale/ve/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/vi/securityLevel.properties b/src/chrome/locale/vi/securityLevel.properties
new file mode 100644
index 00000000..314ba0bd
--- /dev/null
+++ b/src/chrome/locale/vi/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = Má»©c Ä?á»? Báº£o máºt
+securityLevel.standard.level = Chuáº©n
+securityLevel.standard.summary = Táº¥t cáº£ cÃ¡c tÃnh nÄ?ng cá»§a TrÃ¬nh duyá»?t Tor vÃ  trang web Ä?á»?u Ä?Æ°á»£c báºt.
+securityLevel.safer.level = An toÃ n hÆ¡n
+securityLevel.safer.summary = VÃ´ hiá»?u hÃ³a tÃnh nÄ?ng website thÆ°á»?ng gÃ¢y nguy hiá»?m, khiáº¿n má»?t sá»? trang web máº¥t chá»©c nÄ?ng.
+securityLevel.safer.description1 = JavaScript bá»? vÃ´ hiá»?u trÃªn cÃ¡c trang web khÃ´ng cÃ³ HTTPS.
+securityLevel.safer.description2 = Má»?t sá»? phÃ´ng chá»¯ vÃ  kÃ½ hiÃªu toÃ¡n há»?c bá»? vÃ´ hiá»?u.
+securityLevel.safer.description3 = Ã?m thanh vÃ  video (HTML5 media) pháº£i báº¥m-Ä?á»?-phÃ¡t.
+securityLevel.safest.level = An toÃ n nháº¥t
+securityLevel.safest.summary = Chá»? cho phÃ©p cÃ¡c tÃnh nÄ?ng trang web Ä?Æ°á»£c yÃªu cáº§u cho cÃ¡c trang web tÄ©nh vÃ  cÃ¡c dá»?ch vá»¥ cÆ¡ báº£n. Nhá»¯ng thay Ä?á»?i nÃ y áº£nh hÆ°á»?ng Ä?áº¿n hÃ¬nh áº£nh, phÆ°Æ¡ng tiá»?n vÃ  táºp lá»?nh.
+securityLevel.safest.description1 = JavaScript máº·c Ä?á»?nh bá»? vÃ´ hiá»?u trÃªn táº¥t cáº£ cÃ¡c trang.
+securityLevel.safest.description2 = Má»?t sá»? phÃ´ng chá»¯, biá»?u tÆ°á»£ng, vÃ  hÃ¬nh áº£nh bá»? vÃ´ hiá»?u.
+securityLevel.safest.description3 = Ã?m thanh vÃ  video (HTML5 media) pháº£i báº¥m-Ä?á»?-phÃ¡t.
+securityLevel.custom.summary = Nhá»¯ng Ä?iá»?u chá»?nh trong trÃ¬nh duyá»?t cá»§a báº¡n vá»«a táº¡o ra nhá»¯ng lá»?i báº£o máºt báº¥t thÆ°á»?ng. VÃ¬ nhá»¯ng lÃ½ do báº£o máºt vÃ  riÃªng tÆ°, chÃºng tÃ´i khuyáº¿n cÃ¡o báº¡n chá»?n nhá»¯ng cáº¥p Ä?á»? báº£o máºt máº·c Ä?á»?nh khÃ¡c.
+securityLevel.learnMore = Biáº¿t thÃªm
+securityLevel.restoreDefaults = KhÃ´i phá»¥c tráº¡ng thÃ¡i máº·c Ä?á»?nh
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 9f1c50e3..695f6bf1 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Máº¡ch ná»?i Tor má»?i cho trang nÃ y">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Nhá»¯ng cÃ i Ä?áº·t vá»? an ninh...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Nhá»¯ng cÃ i Ä?áº·t Máº¡ng Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Kiá»?m tra Báº£n cáºp nháºt cá»§a trÃ¬nh duyá»?t Tor...">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Báº¥m chuá»?t Ä?á»? khá»?i cháº¡y Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Nhá»¯ng cÃ i Ä?áº·t báº£o máºt cho trÃ¬nh duyá»?t Tor">
-<!ENTITY torbutton.prefs.restore_defaults "KhÃ´i phá»¥c tráº¡ng thÃ¡i máº·c Ä?á»?nh">
-<!ENTITY torbutton.prefs.custom_warning "Nhá»¯ng Ä?iá»?u chá»?nh trong trÃ¬nh duyá»?t cá»§a báº¡n vá»«a táº¡o ra nhá»¯ng lá»?i báº£o máºt báº¥t thÆ°á»?ng. VÃ¬ nhá»¯ng lÃ½ do báº£o máºt vÃ  riÃªng tÆ°, chÃºng tÃ´i khuyáº¿n cÃ¡o báº¡n chá»?n nhá»¯ng cáº¥p Ä?á»? báº£o máºt máº·c Ä?á»?nh khÃ¡c.">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/wa/torbutton.dtd
+++ b/src/chrome/locale/wa/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/wo/torbutton.dtd
+++ b/src/chrome/locale/wo/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/zh-CN/securityLevel.properties b/src/chrome/locale/zh-CN/securityLevel.properties
new file mode 100644
index 00000000..93cea12e
--- /dev/null
+++ b/src/chrome/locale/zh-CN/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = å®?å?¨ç?çº§
+securityLevel.standard.level = æ ?å??å®?å?¨æ?§
+securityLevel.standard.summary = å°?å?¯ç?¨æ??æ??Toræµ?è§?å?¨ä¸?ç½?ç«?å??è?½ã??
+securityLevel.safer.level = ä¸ç?å®?å?¨æ?§
+securityLevel.safer.summary = ç¦?ç?¨ç½?ç«?å??è?½é??å¸¸æ?¯å?±é?©ç??ï¼?è¿?ä¼?å¯¼è?´ä¸?äº?ç«?ä¸?è?½æ£å¸¸è¿?ä½?ã??
+securityLevel.safer.description1 = å?¨é??HTTPSç½?ç«?ï¼?JavaScriptsè¢«ç¦?ç?¨ã??
+securityLevel.safer.description2 = ä¸?äº?å?ä½?ä¸?æ?°å¦ç¬¦å?·è¢«ç¦?ç?¨ã??
+securityLevel.safer.description3 = ç?¹å?»æ?æ?¾é?³é¢?æ??è§?é¢?ï¼?HTML5 åª?ä½?ï¼?ã??
+securityLevel.safest.level = æ??é«?å®?å?¨æ?§
+securityLevel.safest.summary = å?ªå??è®¸ç½?ç«?è¯·æ±?é??æ??ç½?é¡µä¸?å?ºæ?¬æ??å?¡ã??è¿?å°?ä¼?å½±å??å?¾ç??ï¼?åª?ä½?ä¸?è??æ?¬ã??
+securityLevel.safest.description1 = å?¨æ??æ??ç½?ç«?ä¸?é»?è®¤ç¦?ç?¨JavaScriptã??
+securityLevel.safest.description2 = ä¸?äº?å?ä½?ï¼?å?¾æ ?ï¼?æ?°å¦ç¬¦å?·ä¸?å?¾ç??è¢«ç¦?ç?¨ã??
+securityLevel.safest.description3 = ç?¹å?»æ?æ?¾é?³é¢?æ??è§?é¢?ï¼?HTML5 åª?ä½?ï¼?ã??
+securityLevel.custom.summary = æ?¨è?ªå®?ä¹?ç??æµ?è§?å?¨è®¾ç½®å¯¼è?´äº?ä¸?å®?å?¨ç??å®?å?¨è®¾ç½®ã??å?ºäº?å®?å?¨å??é??ç§?è??è??ï¼?æ??ä»¬å»ºè®®æ?¨é??æ?©ä¸?ä¸ªé»?è®¤ç??å®?å?¨çº§å?«ã??
+securityLevel.learnMore = æ?´å¤?è¯¦æ??
+securityLevel.restoreDefaults = æ?¢å¤?é»?è®¤è®¾ç½®
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 5cdea120..483b5c44 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "ä¸ºæ¤ç«?ç?¹ä½¿ç?¨æ?° Tor çº¿è·¯">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "å®?å?¨è®¾ç½®â?¦">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor ç½?ç»?è®¾ç½®â?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser æ£?æ?¥æ?´æ?°â?¦">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "ç?¹æ¤å??å§?å?? Torbutton">
 <!ENTITY torbutton.prefs.security_settings "Tor æµ?è§?å?¨å®?å?¨è®¾ç½®">
-<!ENTITY torbutton.prefs.restore_defaults "æ?¢å¤?é»?è®¤è®¾ç½®">
-<!ENTITY torbutton.prefs.custom_warning "æ?¨è?ªå®?ä¹?ç??æµ?è§?å?¨è®¾ç½®å¯¼è?´äº?ä¸?å®?å?¨ç??å®?å?¨è®¾ç½®ã??å?ºäº?å®?å?¨å??é??ç§?è??è??ï¼?æ??ä»¬å»ºè®®æ?¨é??æ?©ä¸?ä¸ªé»?è®¤ç??å®?å?¨çº§å?«ã??">
 <!ENTITY torbutton.cookiedialog.title "ç®¡ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?æ?¤">
 <!ENTITY torbutton.cookiedialog.domainCol "ä¸»æ?º">
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/chrome/locale/zh-TW/securityLevel.properties b/src/chrome/locale/zh-TW/securityLevel.properties
new file mode 100644
index 00000000..0b5f36a0
--- /dev/null
+++ b/src/chrome/locale/zh-TW/securityLevel.properties
@@ -0,0 +1,16 @@
+securityLevel.securityLevel = å®?å?¨ç?ç´?
+securityLevel.standard.level = æ¨?æº?
+securityLevel.standard.summary = æ??æ??ç??è¦½å?¨è??ç¶²ç«?ç??å??è?½é?½å??ç?¨
+securityLevel.safer.level = è¼?å®?å?¨
+securityLevel.safer.summary = å??ç?¨æ??äº?å??è?½,å? ç?ºå?¶æ??å?±é?ª,æ??é? æ??é?¨ä»½ç¶²ç«?å¤±è?½
+securityLevel.safer.description1 = æ??æ??é??HTTPSç¶²ç«?æ??é ?è¨å??ç?¨JavaScript
+securityLevel.safer.description2 = æ??äº?å?å½¢è??æ?¸å¸ç¬¦è??è¢«å??ç?¨
+securityLevel.safer.description3 = è?²é?³å??å½±ç?? (HTML5 åª?é«?) è¦?é»?æ??æ?æ?¾
+securityLevel.safest.level = æ??å®?å?¨
+securityLevel.safest.summary = å?ªå??æ??é??æ??ç¶²ç«?å??å?ºæ?¬æ??å??ç??ç¶²ç«?å??è?½.é??äº?è®?å??æ??å½±é?¿å??ç??,åª?é«?å??è?³æ?¬.
+securityLevel.safest.description1 = æ??æ??ç¶²ç«?æ??é ?è¨å??ç?¨JavaScript
+securityLevel.safest.description2 = æ??äº?å?å??,å??æ¨?,æ?¸å¸ç¬¦è??è??å??ç??è¢«å??ç?¨
+securityLevel.safest.description3 = è?²é?³å??å½±ç?? (HTML5 åª?é«?) è¦?é»?æ??æ?æ?¾
+securityLevel.custom.summary = æ?¨ç??ç??è¦½å?¨å??äººå??è¨å®?å?¯è?½æ??é? æ??å®?å?¨æ?§ç??ç??æ?®ã??å?ºæ?¼å??äººç¶²è·¯å®?å?¨è??é?±ç§?ç??è??é??ï¼?å»ºè°æ?¨é?¸ç?¨é ?è¨ç??å®?å?¨æ?§å±¤ç´?é?¸é ?ã??
+securityLevel.learnMore = ç¹¼çº?é?±è®?
+securityLevel.restoreDefaults = æ?¢å¾©å?°é ?è¨å?¼
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index e3824e9c..8f3fefcf 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -2,8 +2,6 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "å»ºç«?æ?°ç??æ´?è?¥è·¯ç?±è¿´è·¯ä¾?é?£æ?¥ä¸?æ¤ç¶²ç«?">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "å®?å?¨è¨å®?...">
-<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "æª¢æ?¥æ´?è?¥è·¯ç?±ç??è¦½å?¨æ?´æ?°â?¦">
@@ -12,8 +10,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "æ??ä¸?ä¸?ä»¥å??å§?å?? Torbutton">
 <!ENTITY torbutton.prefs.security_settings "æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¹?å®?å?¨æ?§è¨å®?">
-<!ENTITY torbutton.prefs.restore_defaults "æ?¢å¾©å?°é ?è¨å?¼">
-<!ENTITY torbutton.prefs.custom_warning "æ?¨ç??ç??è¦½å?¨å??äººå??è¨å®?å?¯è?½æ??é? æ??å®?å?¨æ?§ç??ç??æ?®ã??å?ºæ?¼å??äººç¶²è·¯å®?å?¨è??é?±ç§?ç??è??é??ï¼?å»ºè°æ?¨é?¸ç?¨é ?è¨ç??å®?å?¨æ?§å±¤ç´?é?¸é ?ã??">
 <!ENTITY torbutton.cookiedialog.title "ç®¡ç?? Cookie ç??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.domainCol "ä¸»æ©?">
diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd
index baffea1d..fa587065 100644
--- a/src/chrome/locale/zu/torbutton.dtd
+++ b/src/chrome/locale/zu/torbutton.dtd
@@ -6,7 +6,6 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index 270131d2..e5d66d55 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -18,6 +18,7 @@ pref("extensions.torbutton.use_nontor_proxy",false);
 // State prefs:
 pref("extensions.torbutton.startup",false);
 pref("extensions.torbutton.inserted_button",false);
+pref("extensions.torbutton.inserted_security_level",false);
 
 // TODO: This is just part of a stopgap until #14429 gets properly implemented.
 // See #7255 for details. We display the warning three times to make sure the
diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh
index 00de8243..088cdf95 100755
--- a/trans_tools/import-translations.sh
+++ b/trans_tools/import-translations.sh
@@ -24,6 +24,7 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd"
           "browserOnboarding.properties:torbutton-browseronboardingproperties"
           "torbutton.dtd:torbutton-torbuttondtd"
           "torbutton.properties:torbutton-torbuttonproperties"
+          "securityLevel.properties:torbutton-securityLevelproperties"
          )
 
 # Verify that the FILEMAP contains an entry for each Torbutton file.

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

Prev by Author: [tor-commits] [tor-browser-build/master] Bug 29868: Fix installation of python-future package
Next by Author: [tor-commits] [tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 26962 - implement new features onboarding (part 2)."
Previous by thread: [tor-commits] [torbutton/master] Bug 28628: Change onboarding Security panel to open new Security Level panel.
Next by thread: [tor-commits] [tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 25658: Replace security slider with security level UI
Index(es):
- Author
- Thread