[tor-commits] [torbutton/master] Bug 25658: Replace security slider with security level UI
gk at torproject.org
gk at torproject.org
Fri Mar 15 07:12:19 UTC 2019
commit 5a3d6d26e1f8046b20e51d93ca9457a729063bfc
Author: Richard Pospesel <richard at torproject.org>
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 "kliknij, aby odtworzyć".
+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 "kliknij, aby odtworzyć".
+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.
More information about the tor-commits
mailing list