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

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

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

commit 02f6525253c395f35f54d3e492524f05af360ba7
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Mon Oct 17 08:47:43 2016 +0000

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

diff --git a/ach/torbutton.dtd b/ach/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ach/torbutton.dtd
+++ b/ach/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ady/torbutton.dtd b/ady/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ady/torbutton.dtd
+++ b/ady/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/af/torbutton.dtd b/af/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/af/torbutton.dtd
+++ b/af/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ak/torbutton.dtd b/ak/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ak/torbutton.dtd
+++ b/ak/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/am/torbutton.dtd b/am/torbutton.dtd
index 0b68d4e..c42f328 100644
--- a/am/torbutton.dtd
+++ b/am/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "á?¥á??">
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbuttoná?? á??á??á?µá??á??á? á? á?? á?«á?µá?á??">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "á??á?£á?ªá??á?½á?? á??á?°á??á? á?©á? á?µ á??á??á?µ">
 <!ENTITY torbutton.cookiedialog.title "á?¨á?©á?ª á?¥á? á??á??á?½á?? á? á??á??á?¥á?">
 <!ENTITY torbutton.cookiedialog.lockCol "á?¨á?°á? á? á??">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "á?¨á?°á? á? á??á?µ á? á?µá?°á??á? á??á??á??á?? á? á?µá??á??á?µ">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á? á?²á?µ á?©á?ªá??á?½á?? á? á?¥á??">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á? á?²á?µ á?©á?ªá??á?½á?? á? á?µá? á?¥á??">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "á?¨á? á?°á?³ á?³á?ªá?á?? á??á?á?? á?¨á?µá? á?£á?¢á?« á??á??á?¥á?? á? á?µá??á??á??á?¥ (á?¨á??á?? á? á?°á?³ á??á??á?³á?? á?«á??á??á??)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "á?¨á?¶á?µá?°á?? á??á??á?? á?©á?ªá??á?½á?? á?¥á?? á??á??á?½ á??á?¨á?³á?°á?« á??á??á?¥á?? á??á?µá?¥">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "á?¨á? á?³á?½ á?°á?°á?ªá??á?½á?? (á?¥á??á?° Flash á?«á??) á? á?°á??á?á??">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "á?¥á?á?µá??á?? á?¨á??á??á?½ á?¨Tor á? á?³á?½ á?°á? á??á??á??á?½ á?¨á??á??á?© á??á?á??á?®á?½á?? á?á??á?á?©">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ar/torbutton.dtd b/ar/torbutton.dtd
index 5a9998f..a250c28 100644
--- a/ar/torbutton.dtd
+++ b/ar/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨Ù?Ø© ØªÙ?Ø±...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "ØªØÙ?Ù? Ù?Ù? ØªØØ¯Ù?Ø«Ø§Øª Ù?ØªØµÙ?Ø ØªÙ?Ø±...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£Ù?Ø§Ù? Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø·...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ø§Ù?Ù?Ø± Ù?Ø¨Ø¯Ø¡ Ø²Ø± ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.privacy_security_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø£Ù?Ø§Ù? Ù?Ø§Ù?Ø®ØµÙ?ØµÙ?Ù?Ø©">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù?Ø§Ù?ØªØ±Ø§Ø¶Ù?Ø§Øª">
 <!ENTITY torbutton.cookiedialog.title "Ø¥Ø¯Ø§Ø±Ø© Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§Ù?ØÙ?Ø§Ù?Ø© Ù?Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø·">
 <!ENTITY torbutton.cookiedialog.lockCol "Ù?ØÙ?Ù?Ø©">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ø¥Ø²Ø§Ù?Ø© Ø§Ù?Ù?Ù? Ù?Ù?Ù? Ø§Ø³ØªÙ?Ø± Ù?Ù? Ø§Ù?ØÙ?Ø§Ù?Ø©">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ø§ØÙ? Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø· Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ù?Ø§ ØªØÙ? Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø· Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©">
-<!ENTITY torbutton.prefs.priv_caption "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø®ØµÙ?ØµÙ?Ø©">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ù?Ø§ ØªØ³Ø¬Ù? Ø³Ø¬Ù? Ø§Ù?ØªØµÙ?Ø Ø£Ù? Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ø£Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© (ØªÙ?Ø¹Ù?Ù? Ø§Ù?ØªØµÙ?Ø Ø§Ù?Ø®ØµÙ?ØµÙ?)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ØªÙ?Ù?Ù?Ø¯ Ø§Ù?Ù?Cookies Ø§Ù?Ø®Ø§ØµØ© Ø¨Ø§Ù?Ø·Ø±Ù? Ø§Ù?Ø«Ø§Ù?Ø« Ù? Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?ØªØªØ¨Ø¹ Ø§Ù?Ø£Ø®Ø±Ù?.">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "ØªØ¹Ø·Ù?Ù? Ø¥Ø¶Ø§Ù?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø (Ù?Ø«Ù? Ù?Ù?Ø§Ø´)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ØªØºÙ?Ù?Ø± Ø§Ù?ØªÙ?Ø§ØµÙ?Ù? Ø§Ù?ØªÙ? ØªÙ?Ù?Ø²Ù? Ø¹Ù? Ø§Ù?Ù?Ø³ØªØ®Ø¯Ù?Ù?Ù? Ø§Ù?Ø¢Ø®Ø±Ù?Ù? Ù?Ù?ØªØµÙ?Ø ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ù?Ø³ØªÙ?Ù? Ø§Ù?Ø£Ù?Ø§Ù?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø®Ø· Ø§Ù?Ù?Ù?Ø¯Ù?Ø© Ù?Ù? Ø·Ø±Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© Ù?ØØ¸Ù?Ø±Ø©.">
 <!ENTITY torbutton.prefs.sec_custom "Ù?Ù?Ù? Ù?Ø®ØµØµØ©">
 <!ENTITY torbutton.circuit_display.title "Ø¯Ø§Ø¦Ø±Ø© ØªÙ?Ø± Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ù?Ø¹">
-
diff --git a/arn/torbutton.dtd b/arn/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/arn/torbutton.dtd
+++ b/arn/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ast/torbutton.dtd b/ast/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ast/torbutton.dtd
+++ b/ast/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/az/torbutton.dtd b/az/torbutton.dtd
index 462221d..d55690c 100644
--- a/az/torbutton.dtd
+++ b/az/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "A">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!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.privacy_security_settings "Å?É?xsilik vÉ? TÉ?hlÃ¼kÉ?sizlik seÃ§imlÉ?ri">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lanlarÄ± yenidÉ?n yÃ¼klÉ?">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Å?É?xsilik seÃ§imlÉ?ri">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "TÉ?hlÃ¼kÉ?sizlik sÉ?viyyÉ?si">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Manual dÉ?yÉ?rlÉ?r">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ba/torbutton.dtd b/ba/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ba/torbutton.dtd
+++ b/ba/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/be/torbutton.dtd b/be/torbutton.dtd
index a700d9c..1da9bab 100644
--- a/be/torbutton.dtd
+++ b/be/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/bg/torbutton.dtd b/bg/torbutton.dtd
index 9354483..651e99c 100644
--- a/bg/torbutton.dtd
+++ b/bg/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor Ð?Ñ?ÐµÐ¶Ð¾Ð²Ð¸ Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ ...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð·Ð° Ð½Ð¾Ð²Ð° Ð²ÐµÑ?Ñ?Ð¸Ñ? Ð½Ð°  Ð¢Ð¾Ñ? Ð?Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð°Ñ?Ð¸Ñ?Ð° Ð¾Ñ? Ð?Ð¸Ñ?ÐºÐ²Ð¸Ñ?ÐºÐ¸  ...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ð?Ð°Ñ?Ð¸Ñ?Ð½Ð¸ Ð·Ð° Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Ð?Ð¸Ñ?Ð½Ð¸ Ð¸ Ð·Ð°Ñ?Ð¸Ñ?Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?Ñ?Ð·Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸Ñ?Ðµ">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Ð?Ð¸Ñ?Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ð?Ð¸Ð²Ð¾ Ð½Ð° Ð·Ð°Ñ?Ð¸Ñ?Ð°">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ð£ÐµÐ±Ñ?Ð°Ð¹Ñ?-Ð¾Ñ?Ð¸Ð³Ñ?Ñ?ÐµÐ½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ð»Ð¾Ð²Ðµ Ñ?Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½Ð¸">
 <!ENTITY torbutton.prefs.sec_custom "Ð¡Ñ?Ð¾Ð¹Ð½Ð¾Ñ?Ñ?Ð¸ Ð¿Ð¾ Ð¸Ð·Ð±Ð¾Ñ?">
 <!ENTITY torbutton.circuit_display.title "Tor Ð²Ñ?Ñ?Ð·ÐºÐ° Ð·Ð° Ñ?Ð¾Ð·Ð¸ Ñ?Ð°Ð¹Ñ?.">
-
diff --git a/bn/torbutton.dtd b/bn/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/bn/torbutton.dtd
+++ b/bn/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/bn_BD/torbutton.dtd b/bn_BD/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/bn_BD/torbutton.dtd
+++ b/bn_BD/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/bn_IN/torbutton.dtd b/bn_IN/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/bn_IN/torbutton.dtd
+++ b/bn_IN/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/bo/torbutton.dtd b/bo/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/bo/torbutton.dtd
+++ b/bo/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/br/torbutton.dtd b/br/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/br/torbutton.dtd
+++ b/br/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/brx/torbutton.dtd b/brx/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/brx/torbutton.dtd
+++ b/brx/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/bs/torbutton.dtd b/bs/torbutton.dtd
index ebdc48c..01b5f97 100644
--- a/bs/torbutton.dtd
+++ b/bs/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbutton-a">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Vrati poÄ?etno">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "PodeÅ¡avanja privatnosti">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ca/torbutton.dtd b/ca/torbutton.dtd
index 28e0b5f..0ef0cbb 100644
--- a/ca/torbutton.dtd
+++ b/ca/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "PreferÃ¨ncies de privadesa i seguretat...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Cerca una actualitzaciÃ³ del navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Proteccions de les Galetes...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "PreferÃ¨ncies de privadesa i seguretat">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Reestableix predeterminats">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "PreferÃ¨ncies de privadesa">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Nivell de seguretat">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Els fitxers de tipus de lletra provinents de llocs web estan bloquejats. ">
 <!ENTITY torbutton.prefs.sec_custom "Valors personalitzats">
 <!ENTITY torbutton.circuit_display.title "Circuit de tor per a aquest lloc">
-
diff --git a/ceb/torbutton.dtd b/ceb/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ceb/torbutton.dtd
+++ b/ceb/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/cs/torbutton.dtd b/cs/torbutton.dtd
index 2076cbb..f0ea8e0 100644
--- a/cs/torbutton.dtd
+++ b/cs/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "S">
 <!ENTITY torbutton.context_menu.new_circuit "NovÃ© pÅ?ipojenÃ k Toru pro tuto strÃ¡nku">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "NastavenÃ zabezpeÄ?enÃ a ochrany osobnÃch ÃºdajÅ¯">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "NastavenÃ sÃtÄ? Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Hledat aktualizace pro Tor Browser">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrany proti cookies.">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "KliknÄ?te pro inicializaci Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Ochrana osobnÃch ÃºdajÅ¯ a nastavenÃ zabezpeÄ?enÃ">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "PÅ¯vodnÃ nastavenÃ">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "NastavenÃ soukromÃ">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ã?roveÅ? zabezpeÄ?enÃ">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Soubory fontÅ¯ poskytovanÃ© weby jsou blokovÃ¡ny.">
 <!ENTITY torbutton.prefs.sec_custom "VlastnÃ hodnoty">
 <!ENTITY torbutton.circuit_display.title "PÅ?ipojenÃ Tor pro tuto strÃ¡nku">
-
diff --git a/csb/torbutton.dtd b/csb/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/csb/torbutton.dtd
+++ b/csb/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/cv/torbutton.dtd b/cv/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/cv/torbutton.dtd
+++ b/cv/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/cy/torbutton.dtd b/cy/torbutton.dtd
index 64f4ea3..c010b55 100644
--- a/cy/torbutton.dtd
+++ b/cy/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "p">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/da/torbutton.dtd b/da/torbutton.dtd
index 1cd4737..89a94db 100644
--- a/da/torbutton.dtd
+++ b/da/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nyt Tor Circuit for dette site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Privatlivs- og sikkerhedsindstillinger...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor netvÃ¦rksindstillinger...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Led efter Tor Browser opdateringer...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privatlivs- og Sikkerhedsindstillinger">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder">
 <!ENTITY torbutton.cookiedialog.title "HÃ¥ndtÃ©r Cookie-beskyttelser">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle pÃ¥nÃ¦r beskyttede">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privatlivs-indstillinger">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Undlad at registrere historik for browsing eller data for websteder (aktiverer tilstanden Privat browsing)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "BegrÃ¦ns tredjeparts-cookies og andre registreringsdata">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "SlÃ¥ browser-udvidelser fra (sÃ¥som Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Tilpas detaljer som adskiller dig fra andre Tor Browser-brugere">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Sikkerheds Niveau">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fontfiler som kommer fra websteder, er blokeret.">
 <!ENTITY torbutton.prefs.sec_custom "Brugervalgte vÃ¦rdier:">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for dette website">
-
diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index 039e82e..b1a7f19 100644
--- a/de/torbutton.dtd
+++ b/de/torbutton.dtd
@@ -2,8 +2,8 @@
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!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 "PrivatsphÃ¤ren- und Sicherheitseinstellungen â?¦">
-<!ENTITY torbutton.context_menu.preferences.key "E">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!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 â?¦">
@@ -11,7 +11,7 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutz â?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
-<!ENTITY torbutton.prefs.privacy_security_settings "PrivatsphÃ¤ren- und Sicherheitseinstellungen">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Vorgabeeinstellungen wiederherstellen">
 <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten">
 <!ENTITY torbutton.cookiedialog.lockCol "GeschÃ¼tzt">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Alle, auÃ?er die geschÃ¼tzten Cookies entfernen">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Neue Cookies schÃ¼tzen">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schÃ¼tzen">
-<!ENTITY torbutton.prefs.priv_caption "PrivatsphÃ¤reneinstellungen">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Wenn ausgewÃ¤hlt, unterstÃ¼tzen Sie die folgenden Einstellungen dabei Ihre IdentitÃ¤t und Ihren Browserverlauf geheim zu halten. Wir empfehlen dringend fÃ¼r den normalen Tor-Browser-Gebrauch alle PrivatsphÃ¤ren-Felder ausgewÃ¤hlt zu lassen.">
-<!ENTITY torbutton.prefs.block_disk "Browser-Verlauf und Internetdaten nicht speichern (aktiviert den privaten Browser-Modus)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Lassen Sie dieses Feld ausgewÃ¤hlt um zu verhindern, dass sensible Daten, einschlieÃ?lich des Browser-Puffers und Browser-Verlaufs, der Cookie-Datenbank, des Download-Verlaufs, mittelfristiger TLS-Zertifikate und  Webportal-Berechtigungen auf Ihre Festplatte gespeichert werden.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere Ã?berwachungsdaten einschrÃ¤nken">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lassen Sie dieses Feld ausgewÃ¤hlt um zu verhindern, das verschiedene Browserfunktionen ausgenutzt werden um Ihr Surfverhalten nachzuverfolgen. Die verÃ¤nderten Funktionen betreffen: BLOB-URLs, Rundruf-KanÃ¤le, den Browser-Puffer, Cookies, Favicons, HTTP-Authentifizierungs-Kopfdaten, VerknÃ¼pfungs-Vorverbindungen, den lokalen Speicher, URLs von Medienquellen, OCSP-Anfrage, gemeinsame JavaScript-Instanzen und Tickets von TLS-Sitzungen.">
-<!ENTITY torbutton.prefs.block_plugins "Browser-Erweiterungen deaktivieren (wie z.B. Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Lassen Sie dieses Feld ausgewÃ¤hlt um das Laden aller binÃ¤r vorliegenden Erweiterungen zu verhindern. Erweiterungen sind eine ernste Bedrohung fÃ¼r Ihre PrivatsphÃ¤re, weil sie Ihren Browser-Verlauf weitergeben oder Sie in anderer Weise nachverfolgbar machen kÃ¶nnen.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Details Ã¤ndern, die Sie von anderen Tor-Browser-Benutzern unterscheiden">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lassen Sie dieses Feld ausgewÃ¤hlt um bestimmte einzigartige Informationen Ihres Systems vor Webportalen zu verbergen, wie Ihrem Akku-Status, der Rechnerleistung, Tastaturbelegung, dem Sprachprofil, dem Installationsort von Erweiterungen, der Liste der intallierten Erweiterungen, Ihrem Netzwerkstatus, der Bildschirmausrichtung, BildschirmgrÃ¶Ã?e, seitenspezifischen VergrÃ¶Ã?erungseinstellungen, unterstÃ¼tzten Dateitypen, Farbschema und WebGL-UnterstÃ¼tzung.">
 <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Der Sicherheitsschieberegler gestattet Ihnen bestimmte Browserfunktionen, die Ihren Browser fÃ¼r mÃ¶gliche Attacken anfÃ¤lliger machen, zu deaktivieren.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Von Webseiten bereitgestellte Schriftartdateien sind gesperrt.">
 <!ENTITY torbutton.prefs.sec_custom "Eigene Werte">
 <!ENTITY torbutton.circuit_display.title "Tor-Kanal fÃ¼r diese Seite">
-
diff --git a/dz/torbutton.dtd b/dz/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/dz/torbutton.dtd
+++ b/dz/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/el/torbutton.dtd b/el/torbutton.dtd
index e17d26c..6cdc4ab 100644
--- a/el/torbutton.dtd
+++ b/el/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Î¤">
 <!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 "Î?">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Î¿Ï? Î?Î¹ÎºÏ?Ï?Î¿Ï? Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Î?Î»ÎµÎ³Ï?Î¿Ï? Î³Î¹Î± Î?Î½Î±Î²Î¬Î¸Î¼Î¹Ï?Î· Ï?Î¿Ï? Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Î Ï?Î¿Ï?Ï?Î±Ï?Î¯Î± Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î½Î± ÎµÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î¿Ï? Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Ï?Î¿Ï?Ï?Ï?Î¹ÎºÏ?Î½ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï?Î½ ÎºÎ±Î¹ Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Î?Ï?Î¿ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î· Î±Ï?Ï?Î¹ÎºÏ?Î½ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Î½">
 <!ENTITY torbutton.cookiedialog.title "Î?Î¹Î±Ï?ÎµÎ¯Ï?Î¹Ï?Î· Î Ï?Î¿Ï?Ï?Î±Ï?Î¯Î±Ï? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Î Ï?Î¿Ï?Ï?Î±Ï?ÎµÏ?Î¼ÎÎ½Î±">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Î?Ï?Î±Î¯Ï?ÎµÏ?Î· Î?Î»Ï?Î½ Î?ÎºÏ?Ï?Ï? Î±Ï?Ï? Ï?Ï?Î½ Î Ï?Î¿Ï?Ï?Î±Ï?ÎµÏ?Î¼ÎÎ½Ï?Î½">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Î Ï?Î¿Ï?Ï?Î±Ï?Î¯Î± Î?ÎÏ?Î½ Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Î?Î± Î?Î· Î³Î¯Î½ÎµÏ?Î±Î¹ Î Ï?Î¿Ï?Ï?Î±Ï?Î¯Î± Î?ÎÏ?Î½ Cookie">
-<!ENTITY torbutton.prefs.priv_caption "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î±Ï?Î¿Ï?Ï?Î®Ï?Î¿Ï?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Î?Î±Î½ Ï?Î¹Ï? ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ, Î¿Î¹ Î±ÎºÏ?Î»Î¿Ï?Î¸ÎµÏ? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î¸Î± Î²Î¿Î·Î¸Î®Ï?Î¿Ï?Î½ Ï?Ï?Î¿ Î½Î± ÎºÏ?Î±Ï?Î®Ï?Î¿Ï?Î¼Îµ Ï?Î·Î½ Ï?Î±Ï?Ï?Ï?Ï?Î·Ï?Î¬ Ï?Î±Ï? ÎºÎ±Î¹ Ï?Î¿ Î¹Ï?Ï?Î¿Ï?Î¹ÎºÏ? Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î®Ï? Ï?Î±Ï? Î¹Î´Î¹Ï?Ï?Î¹ÎºÏ?. Î£Ï?Î½Î¹Ï?Ï?Î¿Ï?Î¼Îµ Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ Ï?Î»Î± Ï?Î± ÎºÎ¿Ï?Ï?Î¬ÎºÎ¹Î± Î³Î¹Î± Ï?Î·Î½ Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î® Ï?Î±Ï? Î¼Îµ Ï?Î¿Î½ Tor Browser.">
-<!ENTITY torbutton.prefs.block_disk "Î?Î±Î¼Î¼Î¹Î± ÎºÎ±Ï?Î±Î³Ï?Î±Ï?Î· Ï?Î¿Ï? Î¹Ï?Ï?Î¿Ï?Î¹ÎºÏ?Ï? Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î·Ï? Î® Î´ÎµÎ´Î¿Î¼ÎÎ½Ï?Î½ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î±Ï? (ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Ï?Î· Ï?Î·Ï?  ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î·Ï? Î¹Î´Î¹Ï?Ï?Î¹ÎºÎ®Ï? Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î·Ï?) ">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Î?Ï?Î±Ï?Î®Ï?Ï?Îµ Î±Ï?Ï?Î® Ï?Î·Î½ ÎµÏ?Î¹Î»Î¿Î³Î® Î³Î¹Î± Î½Î± Î±Ï?Î¿Ï?Ï?Î³ÎµÏ?Îµ Ï?Î·Î½ Î±Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î· ÎµÏ?Î±Î¯Ï?Î¸Î·Ï?Ï?Î½ Ï?Î»Î·Ï?Î¿Ï?Î¿Ï?Î¹Ï?Î½ Ï?Ï?Î¿Î½ Î´Î¯Ï?ÎºÎ¿, Ï?Ï?Î¼Ï?ÎµÏ?Î¹Î»Î±Î¼Î²Î±Î½Ï?Î¼ÎÎ½Î¿Ï? Ï?Î¿Ï? cache, Ï?Î¿Ï? Î¹Ï?Ï?Î¿Ï?Î¹ÎºÎ¿Ï? Ï?ÎµÏ?Î¹Î®Î³Î·Ï?Î·Ï?, Ï?Ï?Î½ cookies, Ï?Î¿Ï? Î¹Ï?Ï?Î¿Ï?Î¹ÎºÎ¿Ï? Î»Î®Ï?ÎµÏ?Î½, ÎµÎ½Î´Î¹Î¬Î¼ÎµÏ?Ï?Î½ Ï?Î¹Ï?Ï?Î¿Ï?Î¿Î¹Î·Ï?Î¹ÎºÏ?Î½ TLS, ÎºÎ±Î¹ Î±Î´ÎµÎ¹Ï?Î½ Ï?Î¿Ï? ÎÏ?ÎµÏ?Îµ Ï?Î±Ï?ÎÏ?ÎµÎ¹ Ï?Îµ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´ÎµÏ?.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Î ÎµÏ?Î¹Î¿Ï?Î¹Ï?Î¼Î¿Ï? Ï?Ï?Î½ cookies Ï?Ï?Î¹Ï?Ï?Î½ ÎºÎ±Î¹ Î±Î»Î»Ï?Î½ Î´ÎµÎ´Î¿Î¼ÎµÎ½Ï?Î½ Ï?Î±Ï?Î±ÎºÎ¿Î»Î¿Ï?Î¸Î·Ï?Î·Ï?">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Î½ Ï?ÎµÏ?Î¹Î·Î³Î·Ï?Î® (Ï?Î± Ï?Î¿ Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Î?Î»Î»Î¬Î¾Ï?Îµ Ï?Î¹Ï? Î»ÎµÏ?Ï?Î¿Î¼ÎÏ?ÎµÎ¹ÎµÏ? Ï?Î¿Ï? Ï?Î±Ï? Î´Î¹Î±ÎºÏ?Î¯Î½ÎµÎ¹ Î±Ï?Ï? Î¬Î»Î»Î¿Ï?Ï? Ï?Ï?Î®Ï?Ï?ÎµÏ? Ï?Î¿Ï? Tor Browser ">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Î?Ï?Î¯Ï?ÎµÎ´Î¿ Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±Ï?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Î¤Î± Î±Ï?Ï?ÎµÎ¯Î± Î³Ï?Î±Î¼Î¼Î±Ï?Î¿Ï?ÎµÎ¹Ï?Ï?Î½ Ï?Î¿Ï? Ï?Î±Ï?ÎÏ?Î¿Î½Ï?Î±Î¹ Î±Ï?Ï? Ï?Î·Î½ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î± ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î±.">
 <!ENTITY torbutton.prefs.sec_custom "Î?Î¾Î±Ï?Î¿Î¼Î¹ÎºÎµÏ?Î¼ÎÎ½ÎµÏ? ÎµÏ?Î¹Î»Î¿Î³ÎÏ?">
 <!ENTITY torbutton.circuit_display.title "Î?Ï?ÎºÎ»Ï?Î¼Î± Tor Î³Î¹Î± Î±Ï?Ï?Î®Î½ Ï?Î·Î½ Î¹Ï?Ï?Î¿Ï?ÎµÎ»Î¯Î´Î±">
-
diff --git a/en/torbutton.dtd b/en/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/en/torbutton.dtd
+++ b/en/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/en_GB/torbutton.dtd b/en_GB/torbutton.dtd
index a43bcd6..54e950b 100644
--- a/en_GB/torbutton.dtd
+++ b/en_GB/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/eo/torbutton.dtd b/eo/torbutton.dtd
index 50a0b8e..b35a43d 100644
--- a/eo/torbutton.dtd
+++ b/eo/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "A">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "P">
 <!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.privacy_security_settings "Agordoj de privateco kaj sekureco">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "RestaÅri defaÅltojn">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Agordoj de privateco">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Sekureca nivelo">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Propraj valoroj">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index e71b2e9..fa696bd 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 privacidad y seguridad...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ConfiguraciÃ³n de red Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "G">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Comprobar actualizaciÃ³n del Navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "a">
 <!ENTITY torbutton.context_menu.cookieProtections "Protecciones de cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Preferencias de Privacidad y Seguridad">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados ">
 <!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegidas">
@@ -24,16 +24,12 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies">
-<!ENTITY torbutton.prefs.priv_caption "ParÃ¡metros de privacidad">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Cuando estÃ© marcada, los siguientes ajustes ayudan a mantener privada su identidad e historial de navegaciÃ³n. Recomendamos firmemente que mantenga marcadas todas las casillas de privacidad para el uso habitual del Navegador Tor.">
-<!ENTITY torbutton.prefs.block_disk "No registrar historial de navegaciÃ³n o datos del sitio web (habilita Modo de NavegaciÃ³n Privada)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Mantenga marcada esta casilla para evitar guardar datos sensibles en el disco, incluyendo la cachÃ© del navegador, su historial de navegaciÃ³n, la base de datos de cookies, su historial de descargas, certificados TLS intermedios, y los permisos que ha concedido a los sitios web.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "
 Mantenga marcada esta casilla para evitar que diversas caracterÃsticas del navegador sean explotadas para rastrear su navegaciÃ³n por la web. Las caracterÃsticas modificadas incluyen URLs blob (a objetos binarios internos), BroadcastChannel (comunicaciÃ³n interna dentro del mismo origen), cachÃ© del navegador, cookies, favicons, cabeceras Auth de HTTP (autentificaciÃ³n bÃ¡sica), preconexiones de enlaces, objetos localStorage (almacenamiento local para aplicaciones web), URLs de objetos MediaSource (audiovisuales), peticiones OCSP (estado de certificados), SharedWorkers (subprocesos compartidos), y tickets de sesiÃ³n TLS.">
-<!ENTITY torbutton.prefs.block_plugins "Desactivar complementos del navegador (como Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Mantenga marcada esta casilla para evitar que se carguen todos los plugins binarios (complementos externos ejecutables). Los plugins son un serio riesgo para la privacidad, ya que pueden filtrar su historial de navegaciÃ³n o facilitar de otro modo su seguimiento.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios del Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "
 Mantenga marcada esta casilla para ocultar a los sitios web detalles que pudieran ser Ãºnicos acerca de usted, incluyendo el estado de su baterÃa, el rendimiento del equipo, la distribuciÃ³n del teclado, la configuraciÃ³n regional, la ubicaciÃ³n y la lista de los plugins instalados, el estado de la red, la orientaciÃ³n y el tamaÃ±o de la pantalla, niveles de zoom especÃficos para sitios web, tipos de fichero soportados, los colores del sistema, y las capacidades grÃ¡ficas WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad">
@@ -66,4 +62,3 @@ Mantenga marcada esta casilla para ocultar a los sitios web detalles que pudiera
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Los ficheros de fuentes proporcionados por el sitio web estÃ¡n bloqueados.">
 <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio">
-
diff --git a/es_AR/torbutton.dtd b/es_AR/torbutton.dtd
index 2cd50cc..4ed698c 100644
--- a/es_AR/torbutton.dtd
+++ b/es_AR/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Opciones de Privacidad y Seguridad">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Configuraciones de la red Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Verificar actualizaciones para el Navegador de Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Proteccion de Cookie">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Clic para iniciar Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Opciones de Privacidad y Seguridad">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores por defecto">
 <!ENTITY torbutton.cookiedialog.title "Manejar la ProtecciÃ³n de cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas salvo las protegidas ">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Configuraciones de privacidad ">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "No guardar el historial de navegaciÃ³n o los datos de la web ( activa el modo de NavegaciÃ³n Privada)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de rastreo">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Desactivar plugins de los buscadores (como Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Variar los detalles que te distinguen de otros usuarios del Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/es_CL/torbutton.dtd b/es_CL/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/es_CL/torbutton.dtd
+++ b/es_CL/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/es_CO/torbutton.dtd b/es_CO/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/es_CO/torbutton.dtd
+++ b/es_CO/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/es_MX/torbutton.dtd b/es_MX/torbutton.dtd
index 800a7d4..f53c118 100644
--- a/es_MX/torbutton.dtd
+++ b/es_MX/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "G">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restaurar valores predeterminados">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/et/torbutton.dtd b/et/torbutton.dtd
index 171c721..308e17a 100644
--- a/et/torbutton.dtd
+++ b/et/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "f">
-<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/eu/torbutton.dtd b/eu/torbutton.dtd
index f2d16a6..de814d5 100644
--- a/eu/torbutton.dtd
+++ b/eu/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Pribatutasun eta segurtasun ezarpenak...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor Sarearen Ezarpenak...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser eguneraketa egiaztatu">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie babesak...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko">
-<!ENTITY torbutton.prefs.privacy_security_settings "Pribatutasun eta segurtasun ezarpenak">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri">
 <!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu">
 <!ENTITY torbutton.cookiedialog.lockCol "Babestuta">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Denak kendu babestutakoak izan ezik">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Cookie berriak babestu">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ez babestu cookie berririk">
-<!ENTITY torbutton.prefs.priv_caption "Pribatutasun ezarpenak">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ez grabatu nabigatze historia edo webgune datuak (Nabigatze pribatu modua gaitzen du)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Nabigatzaile pluginak ezgaitu (Flash bezala)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Segurtasun maila">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webguneak hornitutako letra fitxategiak blokeatuta daude.">
 <!ENTITY torbutton.prefs.sec_custom "Balio pertsonalizatuak">
 <!ENTITY torbutton.circuit_display.title "Gune honetako Tor zirkuitua">
-
diff --git a/fa/torbutton.dtd b/fa/torbutton.dtd
index 750857e..3dd1693 100644
--- a/fa/torbutton.dtd
+++ b/fa/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ø¨Ø±Ø±Ø³Û? Ø¨Ø±Ù?Ø² Ø±Ø³Ø§Ù?Û? Tor Browser ...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ØÙ?Ø§Ø¸Øª Ú©Ù?Ú©Û? Ù?Ø§...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ø¬Ù?Øª Ø´Ø±Ù?Ø¹ Ø¯Ù?Ù?Ù? ØªÙ?Ø±Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯">
-<!ENTITY torbutton.prefs.privacy_security_settings "ØÙ?Ø¸ ØØ±Û?Ù? Ø®ØµÙ?ØµÛ? Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù?Û?ØªÛ?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù?Ø¯Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø¨Ù? ØØ§Ù?Øª Ù¾Û?Ø´â??Ù?Ø±Ø¶">
 <!ENTITY torbutton.cookiedialog.title "Ù?Ø¯Ù?Ø±Ù?Øª ØÙ?Ø§Ø¸Øª Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§">
 <!ENTITY torbutton.cookiedialog.lockCol "ØÙ?Ø§Ø¸Øª Ø´Ø¯Ù?">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ØØ°Ù? ØªÙ?Ø§Ù? Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§Û? ØÙ?Ø§Ø¸Øª Ù?Ø´Ø¯Ù?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ØÙ?Ø§Ø¸Øª Ø§Ø² Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§Û? Ø¬Ø¯Ù?Ø¯">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ø¹Ø¯Ù? ØÙ?Ø§Ø¸Øª Ø§Ø² Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§Û? Ø¬Ø¯Ù?Ø¯">
-<!ENTITY torbutton.prefs.priv_caption "ØªÙ?Ø¸Û?Ù?Ø§Øª ØØ±Û?Ù? Ø®ØµÙ?ØµÛ?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ø«Ø¨Øªâ??Ù?Ù?Ø±Ø¯Ù? ØªØ§Ø±Ù?Ø®Ú?Ù? Ù?Ø§ Ø¯Ø§Ø¯Ù?â??Ù?Ø§Ù? Ù?Ø¨â??Ú¯Ø§Ù? (Ú¯Ø´Øª Ù? Ú¯Ø°Ø§Ø± â??Ø®ØµÙ?ØµÙ? Ù?Ø¹Ø§Ù? Ù?Ù?â??Ù?Ù?Ø¯)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ù?ØØ¯Ù?Ø¯â??Ù?Ø±Ø¯Ù? Ù?Ù?Ù?Ù?â??Ù?Ø§Ù? Ø·Ø±Ù? Ø³Ù?Ù? Ù? Ø¯Ø§Ø¯Ù?â??Ù?Ø§Ù? Ù¾Ù?Ú¯Ø±Ø¯Ù? Ø¯Ù?Ú¯Ø±">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "ØºÙ?Ø±Ù?Ø¹Ø§Ù?â??Ù?Ø±Ø¯Ù? Ø§Ù?Ø²Ø§Ù?Ù?â??Ù?Ø§Ù? Ù?Ø±Ù?Ø±Ú¯Ø± (Ù?Ø«Ù? Ù?Ù?Ø´)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ØªØºÙ?Ù?Ø±Ø¯Ø§Ø¯Ù? Ø¬Ø²Ø¦Ù?Ø§ØªÙ? Ù?Ù? Ø´Ù?Ø§Ø±Ø§ Ø§Ø² Ù?Ø§Ø±Ø¨Ø±Ø§Ù? Ø¯Ù?Ú¯Ø± ØªÙ?Ø± ØªÙ?Ù?Ø²Ù?Ù?â??Ù?Ù?Ø¯">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ø³Ø·Ø Ø§Ù?Ù?Û?Øª">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ù?Ø§Û?Ù? Ù?Ø§Û? Ù?Ù?Ù?ØªÛ? Ú©Ù? Ø¯Ø± Ù?Ø¨ Ø³Ø§Û?Øª Ø§Ø±Ø§Ø¦Ù? Ù?Û? Ø´Ù?Ù?Ø¯ Ù?Ø³Ø¯Ù?Ø¯ Ø´Ø¯Ù? Ø§Ø³Øª.">
 <!ENTITY torbutton.prefs.sec_custom "ØªÙ?Ø¸Û?Ù? Ø³Ù?Ø§Ø±Ø´Û?">
 <!ENTITY torbutton.circuit_display.title "Ù?Ø¯Ø§Ø± Tor Ø¨Ø±Ø§Û? Ø§Û?Ù? Ø³Ø§Û?Øª">
-
diff --git a/fi/torbutton.dtd b/fi/torbutton.dtd
index 414df5f..3cb7248 100644
--- a/fi/torbutton.dtd
+++ b/fi/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Uusi Tor-kiertotie tÃ¤lle sivustolle">
 <!ENTITY torbutton.context_menu.new_circuit_key "E">
-<!ENTITY torbutton.context_menu.preferences "Yksityisyys- ja turva-asetukset...">
-<!ENTITY torbutton.context_menu.preferences.key "Y">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor-verkkoasetukset...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tarkista Tor-selainpÃ¤ivitys...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "L">
 <!ENTITY torbutton.context_menu.cookieProtections "EvÃ¤stesuojelemiset...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "E">
 <!ENTITY torbutton.button.tooltip "Napsauta Torbutton-painikkeen alustamiseksi">
-<!ENTITY torbutton.prefs.privacy_security_settings "Yksityisyys- ja turva-asetukset">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Palauta oletukset">
 <!ENTITY torbutton.cookiedialog.title "Hallitse evÃ¤steiden suojauksia">
 <!ENTITY torbutton.cookiedialog.lockCol "Suojattu">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Poista kaikki paitsi suojatut">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evÃ¤steet">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ã?lÃ¤ suojaa uusia evÃ¤steitÃ¤">
-<!ENTITY torbutton.prefs.priv_caption "Yksityisyysasetukset">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ã?lÃ¤ sÃ¤ilytÃ¤ selaushistoriaa tai verkkosivuston tietoja (kÃ¤ynnistÃ¤Ã¤ yksityisen selauksen)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "EstÃ¤ kolmannen osapuolen evÃ¤steet ja muut seurantatiedot">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Poista selainliitÃ¤nnÃ¤iset (Flash yms.) kÃ¤ytÃ¶stÃ¤">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Muuta lisÃ¤tietoja, jotka erottavat sinut muista Tor-selainkÃ¤yttÃ¤jistÃ¤">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Turvallisuustaso">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webbisivuston tarjoamat kirjasintiedostot on estetty.">
 <!ENTITY torbutton.prefs.sec_custom "Omat arvot">
 <!ENTITY torbutton.circuit_display.title "Tor-kiertotie tÃ¤lle sivustolle">
-
diff --git a/fil/torbutton.dtd b/fil/torbutton.dtd
index 056d600..84dbef7 100644
--- a/fil/torbutton.dtd
+++ b/fil/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Mga Setting na Pang-Pribado at Seguridad">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Mga Setting na Pang-Pribado">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Lebel ng Seguridad">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom na Halaga">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/fo/torbutton.dtd b/fo/torbutton.dtd
index 38a9dad..a7c3c5f 100644
--- a/fo/torbutton.dtd
+++ b/fo/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
 <!ENTITY torbutton.context_menu.new_circuit_key "Ã°">
-<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
+<!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 "L">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "T">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "TrÃ½st fyri at lesa TorknÃ¸ttin inn">
-<!ENTITY torbutton.prefs.privacy_security_settings "Stillingar fyri trygd og privatar upplÃ½singar">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Nullstilla ">
 <!ENTITY torbutton.cookiedialog.title "Skipa cookie-vernd">
 <!ENTITY torbutton.cookiedialog.lockCol "Vard/ur">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Stika allar cookies uttan tÃ¦r vardu">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Verj nÃ½ggjar cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Verj ikki nÃ½ggjar cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privatir stilligar">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Goym ikki afturlit ella vevdÃ¡tu frÃ¡ kaga (gildar privata reiking)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Avmarka triÃ°jaliÃ°s-cookies og aÃ°ra sporingardÃ¡tu">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Ã?gilda Ãskoytisforrit til kaga (til dÃ¸mis Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Broyt upplÃ½singar, sum skilja teg frÃ¡ Ã¸Ã°rum, sum brÃºka Tor-kagan">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Trygdarstig">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "TillagaÃ° virÃ°i">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd
index b24a33b..6c04abb 100644
--- a/fr/torbutton.dtd
+++ b/fr/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 confidentialitÃ© et de sÃ©curitÃ©">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ParamÃ¨tres du rÃ©seau Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "VÃ©rifier les mises Ã  jour du Navigateur Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Protections contre les cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "ParamÃ¨tres de confidentialitÃ© et de sÃ©curitÃ©">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Valeurs par dÃ©faut">
 <!ENTITY torbutton.cookiedialog.title "GÃ©rer les protections de cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "ProtÃ©gÃ©">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Supprimer tous les cookies non protÃ©gÃ©s">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ProtÃ©ger les nouveaux cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux cookies">
-<!ENTITY torbutton.prefs.priv_caption "ParamÃ¨tres de vie privÃ©e">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les donnÃ©es des sites webs (active le Mode de Navigation PrivÃ©e)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres donnÃ©es de traÃ§age">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "DÃ©sactiver les greffons du navigateur (tels que Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les dÃ©tails qui vous distinguent des autres utilisateurs du Navigateur Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Niveau de sÃ©curitÃ©">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les fichiers de police de caractÃ¨res fournis par des sites Web sont bloquÃ©s.">
 <!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisÃ©es">
 <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site">
-
diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd
index 75146b4..70ca926 100644
--- a/fr_CA/torbutton.dtd
+++ b/fr_CA/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 confidentialitÃ© et de sÃ©curitÃ©">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ParamÃ¨tres du rÃ©seau Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "VÃ©rifier les mÃ j. du navigateur Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Protections des tÃ©moins...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "T">
 <!ENTITY torbutton.button.tooltip "Cliquer pour lancer BoutonTor">
-<!ENTITY torbutton.prefs.privacy_security_settings "ParamÃ¨tres de confidentialitÃ© et de sÃ©curitÃ©">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Valeurs par dÃ©faut">
 <!ENTITY torbutton.cookiedialog.title "GÃ©rer les protections des tÃ©moins">
 <!ENTITY torbutton.cookiedialog.lockCol "ProtÃ©gÃ©">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Enlever tous les tÃ©moins non protÃ©gÃ©s">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ProtÃ©ger les nouveaux tÃ©moins">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux tÃ©moins">
-<!ENTITY torbutton.prefs.priv_caption "ParamÃ¨tres de confidentialitÃ©">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "CochÃ©s, les paramÃ¨tres suivants aident Ã  garder votre identitÃ© et l'historique de navigation confidentiels. Nous recommandons fortement de cocher toutes les cases de confidentialitÃ© pour une utilisation normale de Tor.">
-<!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les donnÃ©es des sites Web (active le mode de navigation privÃ©e)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Gardez cette case cochÃ©e pour empÃªcher l'enregistrement de donnÃ©es dÃ©licates sur le disque, incluant le cache du navigateur, votre historique de navigation, la base de donnÃ©es des fichiers tÃ©moins, votre historique de tÃ©lÃ©chargement, les certificats TLS intermÃ©diaires, et les droits que vous avez donnÃ©s aux sites Web.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les tÃ©moins tiers et les autres donnÃ©es de traÃ§age">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochÃ©e pour empÃªcher que diverses fonctions du navigateur soient utilisÃ©es pour vous suivre Ã  la trace lorsque vous surfez sur le Web. Les fonctions modifiÃ©es incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers tÃ©moins, les favoricÃ´nes, les en-tÃªtes Auth HTTP, les prÃ©connexions de liens, localStorage, les URL de sources de mÃ©dias, les requÃªtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS.">
-<!ENTITY torbutton.prefs.block_plugins "DÃ©sactiver les plugiciels du navigateur (tel que Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Gardez cette case cochÃ©e pour empÃªcher le chargement de tous les plugiciels binaires. Les plugiciels menacent sÃ©rieusement la confidentialitÃ©, car ils peuvent divulguer votre historique de navigation ou faciliter autrement que l'on vous suive Ã  la trace.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les dÃ©tails qui vous distingue d'autres utilisateurs du navigateur Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochÃ©e pour cacher aux sites Web certaines choses qui pourraient Ãªtre uniques Ã  votre sujet, incluant l'Ã©tat de votre batterie, les performances de l'ordinateur, l'agencement du clavier, les paramÃ¨tres de langue, l'emplacement des plugiciels installÃ©s, la liste de plugiciels installÃ©s, l'Ã©tat de votre rÃ©seau, l'orientation de l'Ã©cran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs systÃ¨me et les capacitÃ©s WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Niveau de sÃ©curitÃ©">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Le bouton coulissant SÃ©curitÃ© vous permet de dÃ©sactiver certaines fonctions du navigateur qui le rendent plus vulnÃ©rable aux tentatives de piratage.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les polices fournies par les sites Web sont bloquÃ©es.">
 <!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisÃ©es">
 <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site">
-
diff --git a/fur/torbutton.dtd b/fur/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/fur/torbutton.dtd
+++ b/fur/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/fy/torbutton.dtd b/fy/torbutton.dtd
index 4453eeb..7918b43 100644
--- a/fy/torbutton.dtd
+++ b/fy/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "F">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy- en befeiligingsynstellingen">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy-ynstellingen">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Befeiligingsnivo">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Oanpaste wearden">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ga/torbutton.dtd b/ga/torbutton.dtd
index 119b3e3..e8d29a9 100644
--- a/ga/torbutton.dtd
+++ b/ga/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/gd/torbutton.dtd b/gd/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/gd/torbutton.dtd
+++ b/gd/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/gl/torbutton.dtd b/gl/torbutton.dtd
index fad7d3d..546953a 100644
--- a/gl/torbutton.dtd
+++ b/gl/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restabelecer valores predeterminados">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Axustes de privacidade">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/gu/torbutton.dtd b/gu/torbutton.dtd
index df05cae..250e0d1 100644
--- a/gu/torbutton.dtd
+++ b/gu/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "àª?à«?àª°àª¬àª?àª¨ àª¶àª°à«? àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "àª®à«?àª³àªà«?àª¤ àªªàª¾àª?à«?àª? àª²àª¾àªµà«?">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/gu_IN/torbutton.dtd b/gu_IN/torbutton.dtd
index a6f3b46..c380605 100644
--- a/gu_IN/torbutton.dtd
+++ b/gu_IN/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "S">
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "p">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "àª?àª?àª?àª¤àª¤àª¾ àª?à«?àª àªµàª£à«?àª?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/gun/torbutton.dtd b/gun/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/gun/torbutton.dtd
+++ b/gun/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ha/torbutton.dtd b/ha/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ha/torbutton.dtd
+++ b/ha/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/he/torbutton.dtd b/he/torbutton.dtd
index 7be8a14..3e2ef07 100644
--- a/he/torbutton.dtd
+++ b/he/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "×?×?×?×¨×?×ª ×¨×©×ª Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "×?×¤×© ×¢×?×?×?× ×?×? ×?×?×¤×?×¤×? Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "×?×?×?×?×ª ×¢×?×?×?×?×ª...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "×?×?×¥ ×?×?×?×? ×?×?×ª×?×? ×?×ª Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "×?×?×?×¨×?×ª ×?×?×?×?×? ×?×¤×¨×?×?×?×ª">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "×?×?×¨×? ×?×?×¨×?×¨×ª ×?×?×?×?">
 <!ENTITY torbutton.cookiedialog.title "× ×?×? ×?×?× ×?×ª ×§×?×§×?×?">
 <!ENTITY torbutton.cookiedialog.lockCol "×?×?×?×?">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "×?×?×§ ×?×ª ×?×? ×?×§×?×§×?×? ×?×?×? ×?×?×?× ×?×?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "×?×?×? ×¢×? ×§×?×§×?×? ×?×?×©×?×?">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "×?×? ×ª×?×? ×¢×? ×§×?×§×?×? ×?×?×©×?×?">
-<!ENTITY torbutton.prefs.priv_caption "×?×?×?×¨×?×ª ×¤×¨×?×?×?×ª">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "×?×? ×ª×©×?×?×¨ ×?×?×¡×?×?×¨×?×?×ª ×?×?×?×©×? ×?×? × ×ª×?× ×? ×?×ª×¨×?×? (×?×¤×¢×? ×?×¦×? ×?×?×?×©×? ×¤×¨×?×?×ª)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "×?×?×?×? ×¢×?×?×?×?×ª ×?×¦×? ×©×?×?×©×? ×?×?×?×¡×?×£ ×?×?×?×¢ ×?×?×¨">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "×?×©×?×ª ×ª×?×¡×¤×? ×?×¤×?×¤×? (×?×?×?×? Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "×©× ×? ×¤×¨×?×?×? ×?×?×?×?×?×?×?×? ×?×?× ×? ×?×?×?×? ×?×ª×¨ ×?×©×ª×?×©×? ×?×¤×?×¤×? Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "×¨×?×ª ×?×?×?×?×?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "×§×?×¦×? ×?×?×¤×? ×?×?×ª×¨×?×? ×?×?×?×¡×?×?.">
 <!ENTITY torbutton.prefs.sec_custom "×¢×¨×?×?×? ×?×?×ª×?×?×?×? ×?×?×©×?×ª">
 <!ENTITY torbutton.circuit_display.title "× ×ª×?×? Tor ×?×?×ª×¨ ×?×?">
-
diff --git a/hi/torbutton.dtd b/hi/torbutton.dtd
index b417e3b..a6c9daa 100644
--- a/hi/torbutton.dtd
+++ b/hi/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P/à¤ª">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A/à¤?">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "à¤?à¥?à¤° à¤¬à¤?à¤¨ à¤?à¥? à¤?à¤°à¤?à¤à¤¿à¤¤ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤¯à¥? à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "à¤?à¤?à¤¾à¤?à¤¤ à¤?à¥? à¤²à¤¿à¤? à¤ªà¤¤à¤¿à¤¸à¥?à¤¥à¤¿à¤¤à¤¿à¤¯à¤¾à¤?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/hr/torbutton.dtd b/hr/torbutton.dtd
index 29403d3..c24949f 100644
--- a/hr/torbutton.dtd
+++ b/hr/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novi Tor krug za ovu stranicu">
 <!ENTITY torbutton.context_menu.new_circuit_key "Z">
-<!ENTITY torbutton.context_menu.preferences "Postavke Privatnosti i Sigurnosti...">
-<!ENTITY torbutton.context_menu.preferences.key "p">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor MreÅ¾ne Postavke...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Provjeri Nadogradnje za Tor PretraÅ¾ivaÄ?..">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tita kolaÄ?iÄ?a...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "Z">
 <!ENTITY torbutton.button.tooltip "Kliknite za pokretanje Torbuttona">
-<!ENTITY torbutton.prefs.privacy_security_settings "Postavke Privatnosti i Sigurnosti">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Postavke Privatnosti">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Nivo Sigurnosti">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fontovi pruÅ¾ani od strane web-stranica su blokirani.">
 <!ENTITY torbutton.prefs.sec_custom "PrilagoÄ?ene vrijednosti">
 <!ENTITY torbutton.circuit_display.title "Tor krug za ovu stranicu">
-
diff --git a/hr_HR/torbutton.dtd b/hr_HR/torbutton.dtd
index 4f000ea..972499a 100644
--- a/hr_HR/torbutton.dtd
+++ b/hr_HR/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "l">
 <!ENTITY torbutton.context_menu.new_circuit "Novi Tor krug za ovu stranicu">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Postavke privatnosti i sigurnosti...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor mreÅ¾ne postavke...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Provjeri za nadogradnju Tor Browsera...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tita kolaÄ?iÄ?a...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbuttona">
-<!ENTITY torbutton.prefs.privacy_security_settings "Postavke privatnosti i sigurnosti">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Vrati zadano">
 <!ENTITY torbutton.cookiedialog.title "Upravljaj zaÅ¡titom kolaÄ?iÄ?a">
 <!ENTITY torbutton.cookiedialog.lockCol "ZaÅ¡tiÄ?eno">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Makni sve osim zaÅ¡tiÄ?enih">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ZaÅ¡titi nove kolaÄ?iÄ?e">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nemoj Å¡titi nove kolaÄ?iÄ?e">
-<!ENTITY torbutton.prefs.priv_caption "Postavke privatnosti">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Kad je ukljuÄ?ena, ova opcija Vam pomaÅ¾e pri odrÅ¾avanju privatnosti VaÅ¡eg identiteta i povijesti pregledavanja. PreporuÄ?ujemo da ostavite sve opcije privatnosti ukljuÄ?ene pri normalnom koriÅ¡tenju Tor Browsera.">
-<!ENTITY torbutton.prefs.block_disk "Ne snimaj povijest pregledavanja ili podatke stranica (omoguÄ?uje Mod Privatnog Pregledavanja)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Ostavite ovu opciju ukljuÄ?enu kako bi izbjegli pohranu osjetljivih podataka na disk, ukljuÄ?ujuÄ?i meÄ?uspremnik preglednika, VaÅ¡u povijest pregledavanja, bazu kolaÄ?iÄ?a, povijest preuzimanja, posredniÄ?ke TLS certifikate i dozvole koje ste dali web stranicama.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "OgraniÄ?i kolaÄ?iÄ?e treÄ?e strane i ostale podatke za praÄ?enje">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Ostavite ovu opciju ukljuÄ?enu kako bi sprijeÄ?ili zlouporabu raznih preglednika u svrhu praÄ?enja VaÅ¡eg surfanja. Modificirane znaÄ?ajke ukljuÄ?uju lokalne URL-ove, kanale odaÅ¡iljanja, meÄ?uspremnik preglednika, kolaÄ?iÄ?e, ikone favorita, HTTP autentikacijska zaglavlja, predpoveznice, lokalnu pohranu, mediaSource URL-ove, OCSP zahtjeve, SharedWorkerse i kartice TLS sesije.">
-<!ENTITY torbutton.prefs.block_plugins "Onesposobi prikljuÄ?ke preglednika (npr. Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Ostavite ovu opciju ukljuÄ?enu kako bi zaustavili uÄ?itavanje svih binarnih prikljuÄ?aka. PrikljuÄ?ci su ozbiljan sigurnosni rizik jer mogu iscuriti VaÅ¡u povijest pregledavanja ili na druge naÄ?ine olakÅ¡ati VaÅ¡e praÄ?enje.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Promjeni detalje koji te razlikuju od ostalih korisnika Tora">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ostavite ovu opciju ukljuÄ?enu kako bi sakrili unikatne informacije o sebi od web stranica. Unikatne informacije ukljuÄ?uju stanje barterije, performanse raÄ?unala, postavke tipkovnice, lokalitet, lokaciju instaliranih prikljuÄ?aka, popis instaliranih prikljuÄ?aka, mreÅ¾ni status, orijentaciju ekrana, veliÄ?inu ekrana, razine poveÄ?anja stranica, podrÅ¾ane datoteke, boje sustava i WebGL sposobnosti.">
 <!ENTITY torbutton.prefs.sec_caption "Razina sigurnosti">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Sigurnosni klizaÄ? Vam omoguÄ?uje onemoguÄ?avanje odreÄ?enih znaÄ?ajki preglednika koje ga mogu uÄ?initi ranjivijim na hakerske napade.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Datoteke fontova pruÅ¾ene od strane web stranice su blokirane.">
 <!ENTITY torbutton.prefs.sec_custom "PrilagoÄ?ene Vrijednosti">
 <!ENTITY torbutton.circuit_display.title "Tor krug za ovu stranicu">
-
diff --git a/ht/torbutton.dtd b/ht/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ht/torbutton.dtd
+++ b/ht/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/hu/torbutton.dtd b/hu/torbutton.dtd
index d74038b..cc72305 100644
--- a/hu/torbutton.dtd
+++ b/hu/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 Ã©s AdatvÃ©delmi beÃ¡llÃtÃ¡sok...">
-<!ENTITY torbutton.context_menu.preferences.key "B">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!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 "M">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser frissÃtÃ©sek keresÃ©se">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "SÃ¼ti vÃ©delmek...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "S">
 <!ENTITY torbutton.button.tooltip "Kattintson a Torbutton inicializÃ¡lÃ¡sÃ¡hoz">
-<!ENTITY torbutton.prefs.privacy_security_settings "BiztonsÃ¡gi Ã©s adatvÃ©delmi beÃ¡llÃtÃ¡sok">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "AlapÃ©rtÃ©kek visszaÃ¡llÃtÃ¡sa">
 <!ENTITY torbutton.cookiedialog.title "SÃ¼ti vÃ©delem kezelÃ©se">
 <!ENTITY torbutton.cookiedialog.lockCol "VÃ©dett">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "A vÃ©dett kivÃ©telÃ©vel az Ã¶sszes tÃ¶rlÃ©se">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "VÃ©dje az Ãºj sÃ¼tiket">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne vÃ©dje az Ãºj sÃ¼tiket">
-<!ENTITY torbutton.prefs.priv_caption "AdatvÃ©delmi BeÃ¡llÃtÃ¡sok">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ne rÃ¶gzÃtsen bÃ¶ngÃ©szÅ? elÅ?zmÃ©nyeket, vagy weboldal adatot (engedÃ©lyezi a PrivÃ¡t bÃ¶ngÃ©szÅ? mÃ³dot)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik fÃ©ltÅ?l szÃ¡rmazÃ³ sÃ¼tik Ã©s nyomkÃ¶vetÃ©si adatok korlÃ¡tozÃ¡sa">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "BÃ¶ngÃ©szÅ? kiegÃ©szÃtÅ?k kikapcsolÃ¡sa (mint pl. a Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "VÃ¡ltoztassa meg a rÃ©szleteket, amik megkÃ¼lÃ¶nbÃ¶ztetik a tÃ¶bbi Tor Browser felhasznÃ¡lÃ³tÃ³l">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "BiztonsÃ¡gi szint">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Weboldal-biztosÃtott font Ã¡llomÃ¡nyok tiltva.">
 <!ENTITY torbutton.prefs.sec_custom "EgyÃ©ni Ã©rtÃ©kek">
 <!ENTITY torbutton.circuit_display.title "Tor Ã¡ramkÃ¶r ehhez az oldalhoz">
-
diff --git a/hy/torbutton.dtd b/hy/torbutton.dtd
index b5cc74b..5f79c4a 100644
--- a/hy/torbutton.dtd
+++ b/hy/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor Õ?Õ¡Õ¶Ö?Õ« Ô¿Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?â?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Õ?Õ¿Õ¸Ö?Õ£Õ¥Õ¬ Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ¹Õ« Õ©Õ¡Ö?Õ´Õ¡Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨â?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ô¹ÕÕ¸Ö?Õ¯Õ¶Õ¥Ö?Õ« Õ?Õ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö?Õ©ÕµÕ¡Õ¶ Ö? Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Ô³Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö?Õ©ÕµÕ¡Õ¶ Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ´Õ¡Õ¯Õ¡Ö?Õ¤Õ¡Õ¯Õ¨">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ia/torbutton.dtd b/ia/torbutton.dtd
index 4807a44..988d08b 100644
--- a/ia/torbutton.dtd
+++ b/ia/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/id/torbutton.dtd b/id/torbutton.dtd
index a4a612d..d8fc7b0 100644
--- a/id/torbutton.dtd
+++ b/id/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 Privasi dan Keamananâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Pengaturan Jaringan Torâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Cek Versi Peramban Tor Terkini">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Perlindungan Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan TombolTor">
-<!ENTITY torbutton.prefs.privacy_security_settings "Pengaturan Privasi dan Keamanan">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Kembalikan ke asal">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Pengaturan Privasi">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Nonaktifkan ...">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ubah rincian yang membedakan Anda dari pengguna peramban Tor lain.">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Tingkat Keamanan">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Font yang disediakan website diblokir.">
 <!ENTITY torbutton.prefs.sec_custom "Nilai Kustom">
 <!ENTITY torbutton.circuit_display.title "Sirkuit Tor untuk website ini">
-
diff --git a/is/torbutton.dtd b/is/torbutton.dtd
index 3a70dc9..e01c469 100644
--- a/is/torbutton.dtd
+++ b/is/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Stillingar gagnaleyndar og Ã¶ryggis...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Netkerfisstillingar Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "AthugaÃ°u meÃ° uppfÃ¦rslur Tor-vafra...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Varnir gegn smÃ¡kÃ¶kum...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Smelltu til aÃ° kveikja Ã¡ Tor-hnapp">
-<!ENTITY torbutton.prefs.privacy_security_settings "Stillingar gagnaleyndar og Ã¶ryggis">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Frumstilla Ã¡ sjÃ¡lfgefiÃ°">
 <!ENTITY torbutton.cookiedialog.title "SÃ½sla meÃ° varnir Ã¡ smÃ¡kÃ¶kum">
 <!ENTITY torbutton.cookiedialog.lockCol "VariÃ°">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "FjarlÃ¦gja allar aÃ°rar en verndaÃ°ar">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Vernda nÃ½jar smÃ¡kÃ¶kur">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ekki vernda nÃ½jar smÃ¡kÃ¶kur">
-<!ENTITY torbutton.prefs.priv_caption "Stillingar gagnaleyndar">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ekki skrÃ¡ feril vafurs eÃ°a gÃ¶gn vefsvÃ¦Ã°a (virkjar einkavafurham)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Takmarka smÃ¡kÃ¶kur frÃ¡ Ã¾riÃ°ja aÃ°ila og Ã¶nnur ferligÃ¶gn">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Gera vafraviÃ°bÃ¦tur Ã³virkar (svo sem Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Breyta atriÃ°um sem gera Ã¾ig Ã³lÃkan Ã¶Ã°rum notendum Tor-vafrans">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ã?ryggisstig">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -65,4 +61,3 @@ breytingar (svÃfa yfir meÃ° bendli til aÃ° sjÃ¡ nÃ¡nar):">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "LokaÃ° er Ã¡ leturskrÃ¡r sem eiga uppruna sinn Ã¡ vefsvÃ¦Ã°inu.">
 <!ENTITY torbutton.prefs.sec_custom "SÃ©rsniÃ°in gildi">
 <!ENTITY torbutton.circuit_display.title "Tor-rÃ¡s fyrir Ã¾etta vefsvÃ¦Ã°i">
-
diff --git a/it/torbutton.dtd b/it/torbutton.dtd
index 3d73a2a..3222861 100644
--- a/it/torbutton.dtd
+++ b/it/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 sicurezza e privacy...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Impostazioni di rete di Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Controllo per aggiornamento Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Protezioni dei Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Impostazioni di Privacy e Sicurezza">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Reimposta i valori di default">
 <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protetto">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Rimuovi tutti tranne quelli protetti">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteggi i nuovi cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie">
-<!ENTITY torbutton.prefs.priv_caption "Impostazioni Privacy">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Quando selezionate, le seguenti impostazioni aiutano a tenere nascosta la tua identitÃ  e storia di navigazione. Per un uso normale del Browser Tor, ti raccomandiamo fortemente di mantenere selezionati tutti i box relativi alla privacy.">
-<!ENTITY torbutton.prefs.block_disk "Non registrare la cronologia di navigazione o i dati dei siti (attiva la Navigazione Anonima)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Mantieni questo box selezionato per evitare di salvare dati sensibili sul disco fisso, inclusa la cache del browser, la tua storia di navigazione, il database dei cookie, la storia dei tuoi download, certificati TLS intermedi, and le autorizzazioni che hai concesso ai siti.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Mantieni questo box selezionato per evitare che diverse funzionalitÃ  del browser possano essere utilizzate per tracciare la tua navigazione. Le funzionalitÃ  modificate includono URL blob, canali di trasmissione, la cache del browser, cookie, favicon, intestazioni di Auth HTTP, link a cui ti sei connesso, localStorage, URL mediaSource, richieste OCSP, SharedWorkers, a ticket di sessioni TLS.">
-<!ENTITY torbutton.prefs.block_plugins "Disabilita i plugin del browser (come Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Mantieni questo box selezionato per interrompere il caricamento di tutti i plugin binari. I Plugin rappresentano un serio rischio per la privacy poichÃ¨ possono lasciar trapelare la tua storia di navigazione o comunque rendere piÃ¹ facile tracciarti.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantieni questo box selezionato per nascondere ai siti informazioni univoche su di te, incluse lo stato della batteria, le performance del computer, il layout della tastiera, locale, il luogo di installazione dei plugin, la lista dei plugin installati, lo stato della tua rete, l'orientamento dello schermo, le dimensioni dello schermo, livelli di zoom specifici per i siti, le tipologie di file supportati, i colori del sistema, and le capacitÃ  di gestire WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Il Security Slider ti permette di disabilitare determinate funzionalitÃ  del browser che potrebbero renderlo piÃ¹ vulnerabile a tentativi di attacco.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati.">
 <!ENTITY torbutton.prefs.sec_custom "Valori personalizzati">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito">
-
diff --git a/ja/torbutton.dtd b/ja/torbutton.dtd
index ed08264..9fcffa9 100644
--- a/ja/torbutton.dtd
+++ b/ja/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Torã??ã??ã??ã?¯ã?¼ã?¯ã?®è¨å®?...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "TorBrowserã?®ã?¢ã??ã??ã??ã?¼ã??ã??ç¢ºèª?">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie ã?®é?²å¾¡">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbuttonã??å??æ??ç?¶æ??ã?«æ?»ã??">
-<!ENTITY torbutton.prefs.privacy_security_settings "ã??ã?©ã?¤ã??ã?·ã?¼ã?¨ã?»ã?ã?¥ã?ªã??ã?£ã?¼ã?®è¨å®?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "ã??ã??ã?©ã?«ã??è¨å®?ã?«æ?»ã??">
 <!ENTITY torbutton.cookiedialog.title "Cookieä¿?è·ã??ç®¡ç??">
 <!ENTITY torbutton.cookiedialog.lockCol "ä¿?è·æ¸?ã?¿">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ä¿?è·ã??ã??ã?¦ã??ã??ã??ã?®ä»¥å¤?å??é?¤">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "æ?°ã??ã??Cookieã??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "æ?°ã??ã??Cookieã??ä¿?è·ã??ã?ªã??">
-<!ENTITY torbutton.prefs.priv_caption "ã??ã?©ã?¤ã??ã?·ã?¼è¨å®?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "ä»¥ä¸?ã?®è¨å®?ã??ã??ã?§ã??ã?¯ã??ã??ã?¦ã??ã??ã??ã?¨ã?§ã??ã??ã?ªã??ã?®èº«å??ã?¨é?²è¦§å±¥æ´ã??é? ã??ã?®ã?«å½¹ç«?ã?¤ã??é??å¸¸ã?®Torã??ã?©ã?¦ã?¶ã?®ä½¿ç?¨ã?§ã?¯ã??ã??ã?¹ã?¦ã?®ã??ã??ã??ã??ã?©ã?¤ã??ã?·ã?¼ã?«é?¢ã??ã??ã??ã??ã?¯ã?¹ã??ã??ã?§ã??ã?¯ã??ã??ã?¾ã?¾ã?«ã??ã??ã??ã?¨ã??å¼·ã??æ?¨å¥¨ã??">
-<!ENTITY torbutton.prefs.block_disk "ã??ã?©ã?¦ã?¸ã?³ã?°å±¥æ´ã??ã?¦ã?§ã??ã?µã?¤ã??ã?®ã??ã?¼ã?¿ã??è¨?é?²ã??ã?ªã?? (ã??ã?©ã?¤ã??ã?¼ã??ã??ã?©ã?¦ã?¸ã?³ã?°ã?¢ã?¼ã??ã??æ??å?¹å??)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "ã??ã?®ã??ã??ã?¯ã?¹ã??ã??ã?§ã??ã?¯ã??ã??ã?¾ã?¾ã?«ã??ã??ã??ã?¨ã?§ã??é??è¦?ã?ªã??ã?¼ã?¿ã??ã??ã?£ã?¹ã?¯ã?«ä¿?å?ã??ã??ã??ã??ã?¨ã??é?²ã??ã??ä¾?ã??ã?°ã??ã?©ã?¦ã?¶ã?¼ã?»ã?ã?£ã??ã?·ã?¥ã??ã??ã?ªã??ã?®é?²è¦§å±¥æ´ã??ã?¯ã??ã?ã?¼ã?®ã??ã?¼ã?¿ã??ã?¼ã?¹ã??ã??ã?ªã??ã?®ã??ã?¦ã?³ã?ã?¼ã??å±¥æ´ã??ä¸é??TLSè¨¼æ??æ?¸ã??ã?¦ã?§ã??ã?µã?¤ã??ã?«ã??ã?ªã??ã??ä¸?ã??ã??è¨±å?¯ã??">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ã?µã?¼ã??ã??ã?¼ã??ã?£ã?¼ã?®Cookieã??ã??ã?®ä»?ã?®ã??ã?©ã??ã?ã?³ã?°ã??ã?¼ã?¿ã??å?¶é??">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ã??ã?®ã??ã??ã?¯ã?¹ã??ã??ã?§ã??ã?¯ã??ã??ã?¾ã?¾ã?«ã??ã??ã??ã?¨ã?§ã??æ§?ã??ã?ªã??ã?©ã?¦ã?¶ã?¼ã?®æ©?è?½ã??æ?ªç?¨ã??ã??ã?¦ã?§ã??ã?®é?²è¦§ä¸ã?«è¿½è·¡ã??ã??ã??ã??ã?¨ã??é?²ã??ã??å½±é?¿ã??å??ã??ã??æ©?è?½ï¼?blob URLã??ã??ã?ã?¼ã??ã?ã?£ã?¹ã??ã?»ã??ã?£ã?³ã??ã?«ã??ã??ã?©ã?¦ã?¶ã?¼ã?»ã?ã?£ã??ã?·ã?¥ã??ã?¯ã??ã?ã?¼ã??faviconã??HTTPèª?è¨¼ã??ã??ã??ã?¼ã??link preconnectsã??ã?ã?¼ã?«ã?«ã?¹ã??ã?¬ã?¼ã?¸ã??mediaSource URLã??OCSPã?ªã?¯ã?¨ã?¹ã??ã??å?±æ??ã?¯ã?¼ã?«ã?¼ã??TLSã?»ã??ã?·ã?§ã?³ã?»ã??ã?±ã??ã??ã?ªã?©ã??">
-<!ENTITY torbutton.prefs.block_plugins "ã??ã?©ã?¦ã?¶ã?®ã??ã?©ã?°ã?¤ã?³(ã??ã?©ã??ã?·ã?¥ã?ªã?©)ã??ç?¡å?¹å??">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "ã??ã?®ã??ã??ã?¯ã?¹ã??ã??ã?§ã??ã?¯ã??ã??ã?¾ã?¾ã?«ã??ã??ã??ã?¨ã?§ã??ã??ã?¹ã?¦ã?®ã??ã?¤ã??ã?ªã?¼ã?»ã??ã?©ã?°ã?¤ã?³ã?®èªã?¿è¾¼ã?¿ã??é?²æ¢ã??ã??ã?©ã?°ã?¤ã?³ã?¯é?²è¦§å±¥æ´ã??æ¼?æ´©ã??ã??ã?ªã?©ã??ã?ªã??ã??è¿½è·¡ã??ã??ã??ã??ã??ã??ã??ã??æ·±å?»ã?ªã??ã?©ã?¤ã??ã?·ã?¼ã?¸ã?®ã?ªã?¹ã?¯ã??">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ã??ã?ªã??ã?¨ã?»ã??ã?®Torã??ã?©ã?¦ã?¶ã?®ã?¦ã?¼ã?¶ã?¼ã??å?ºå?¥ã??ã??è©³ç´°ã??å¤?æ?´">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ã??ã?®ã??ã??ã?¯ã?¹ã??ã??ã?§ã??ã?¯ã??ã??ã?¾ã?¾ã?«ã??ã??ã??ã?¨ã?§ã??ã?¦ã?§ã??ã?µã?¤ã??ã??ã??ã??ã?ªã??ã??è?å?¥ã??ã??å??å®¹ã??é? ã??ï¼?ã??ã??ã??ã?ªã?¼ç?¶æ??ã??ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã?®æ?§è?½ã??ã?ã?¼ã??ã?¼ã??ã?®é??å??ã??å?°å??è¨å®?ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã??ã??ã?©ã?°ã?¤ã?³ã?®å ´æ??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã??ã??ã?©ã?°ã?¤ã?³ã?®ä¸?è¦§ã??ã??ã?ªã??ã?®ã??ã??ã??ã?¯ã?¼ã?¯ç?¶æ??ã??ç?»é?¢ã?®å??ã??ã??ç?»é?¢ã?®å¤§ã??ã??ã??ã?µã?¤ã??ã??ã?¨ã?®ã?ºã?¼ã? ã?¬ã??ã?«ã??å¯¾å¿?ã??ã??ã??ã?¡ã?¤ã?«ã?®ç¨®é¡?ã??ã?·ã?¹ã??ã? ã?®è?²ã??WebGLè?½å??ã?ªã?©ã??">
 <!ENTITY torbutton.prefs.sec_caption "ã?»ã?ã?¥ã?ªã??ã?£ã?¬ã??ã?«">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "ã?»ã?ã?¥ã?ªã??ã?£ã?»ã?¹ã?©ã?¤ã??ã?¼ã??ä½¿ã?£ã?¦ã??ã??ã?ªã??ã?®ã??ã?©ã?¦ã?¶ã?¼ã??ã??ã??ã?ã?³ã?°ã?®è©¦ã?¿ã?«å¯¾ã??ã?¦ã??ã??è??å¼±ã?«ã??ã??å?¯è?½æ?§ã?®ã??ã??ã??ã?©ã?¦ã?¶ã?¼ã?®æ©?è?½ã??ç?¡å?¹ã?«ã?§ã??ã?¾ã??ã??">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web ã?µã?¤ã??ã??æ??ä¾?ã??ã??ã??ã?©ã?³ã??ã?¯ã??ã?ã??ã?¯ã??ã??ã?¾ã??ã??">
 <!ENTITY torbutton.prefs.sec_custom "ã?«ã?¹ã?¿ã? å?¤">
 <!ENTITY torbutton.circuit_display.title "ã??ã?®ã?µã?¤ã??ç?¨ã?® Tor ã?µã?¼ã?ã??ã??">
-
diff --git a/jv/torbutton.dtd b/jv/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/jv/torbutton.dtd
+++ b/jv/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ka/torbutton.dtd
+++ b/ka/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/kk/torbutton.dtd b/kk/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/kk/torbutton.dtd
+++ b/kk/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/km/torbutton.dtd b/km/torbutton.dtd
index b101c80..3fd2110 100644
--- a/km/torbutton.dtd
+++ b/km/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "á??á?»á??â??á??á?¾á??á??á??á?¸â??á??á?¶á??á??á??á??á??á?¾á?? Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "á??á??á??á?¶á??â??á??á??á??á?¶á??á??á?¾á??">
 <!ENTITY torbutton.cookiedialog.title "á??á??á??á??á??á??á??á??á??â??á??á?¶á??â??á??á?¶á??á??á?¶á??â??á??á?¼á??á?¸">
 <!ENTITY torbutton.cookiedialog.lockCol "á??á?¶á??â??á??á?¶á??á??á?¶á??">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "á??á?»á??â??á??á??á??â??á??á?¶á??á??á?¢á??á??â??á??á??á?»á??á??á??á??â??á??á?¶á??â??á??á?¶á??â??á??á?¶á??">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á??á?¶á??á??á?¶á??â??á??á?¼á??á?¸â??á??á??á??á?¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á??á?»á??â??á??á?¶á??â??á??á?¶á??â??á??á?¼á??á?¸â??á??á??á??á?¸">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "á??á?»á??â??á??á?¶á??á??á?¶á??á??á??â??á??á??á??á??á??á??á??á?· á?¬â??á??á?·á??á??á??á??á??á??â??á??á??á??á??á??â??á??á??á??á??á?¶á?? (á??á?¾á??â??á??á??á??á??â??á??á?¶á??â??á??á?»á??á??á??â??á?¯á??á??á??)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "á??á?¶á??á??â??á??á??á??á??á?·á??â??á??á?¼á??á?¸â??á??á?¶á??á?¸â??á??á?¸á??á?¸ á??á?·á??â??á??á?·á??á??á??á??á??á??â??á??á?¶á??á??á?¶á??â??á??á??á??á??á??â??á??á??á??">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "á??á?·á??â??á??á??á??á??á??á?·á??á?¸â??á??á??á??á?½á??â??á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á?? (á??á?¼á??â??á??á?¶â??á?§á??á??á??á??á??â??á??á??á??á?»á??â??á??á??á??á??)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "á??á??á??á?¶á??á??á??á??á??á?¼á??â??á??á??á??á??á??á?¶á??â??á??á??á??á?¢á?·á??â??á??á??á??â??â??á??á??á??á? á?¶á??â??á??á?¶á??â??á??á?»á??â??á??á??á??á?¶â??á?¢á??á??á??â??á??á?¸â??á?¢á??á??á??â??á??á??á??á?¾á??á??á??á?¶á??á??â?? Tor Browser á??á??á??á??á??â??á??á??á??">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/kn/torbutton.dtd b/kn/torbutton.dtd
index 4b67aa1..1c137a6 100644
--- a/kn/torbutton.dtd
+++ b/kn/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "à²?à²¾à²°à³? à²¨à³?à²?à³?à²µà²°à³?à²?à³? à²¸à³?à²?à³?à²?à²¿à²?à²?à³?à²?à²³à³? ...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "à²?à²¾à²°à³? à²¬à³?à²°à³?à²¸à²°à³? à²?à²ªà³?à²¡à³?à³?à²?à³? à²ªà²°à²¿à²¶à²¿à³?à²²à²¿à²¸à²¿ ...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "à²?à³?à²?à³?à²?à³? à²°à²?à³?à²·à²£à³?à²?à²³à³? ...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "à²?à³?à²ªà³?à²¯à²¤à³? à²®à²¤à³?à²¤à³? à²à²¦à³?à²°à²¤à³? à²¸à³?à²?à³?à²?à²¿à²?à²?à³?à²?à²³à³?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "à²?à³?à²ªà³?à²¯à²¤à³? à²¸à³?à²?à³?à²?à²¿à²?à²?à³?à²?à²³à³?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à²¸à³?à²°à²?à³?à²·à²¤à²¾ à²®à²?à³?à²?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "à²µà²¾à²¡à²¿à²?à³? à²®à³?à²²à³?à²¯à²?à²³à³?">
 <!ENTITY torbutton.circuit_display.title "à²? à²¸à³?à³?à²?à³?à²?à³? à²?à²¾à²°à³? à²¸à²°à³?à²?à³?à²¯à³?à²?à³?">
-
diff --git a/ko/torbutton.dtd b/ko/torbutton.dtd
index 23392d1..2eb2e71 100644
--- a/ko/torbutton.dtd
+++ b/ko/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "í? ë¥´ ë?¤í?¸ì??í?¬ ì?¤ì ?...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "í? ë¥´ ë¸?ë?¼ì?°ì ? ì??ë?°ì?´í?¸ ì²´í?¬í??ê¸°...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ì¿ í?¤ ë³´í?¸....">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton ì?¤ì ? ì´?ê¸°í??">
-<!ENTITY torbutton.prefs.privacy_security_settings "ê°?ì?¸ ì ?ë³´ì?? ë³´ì?? ì?¤ì ?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "ì?¤ì ? ì´?ê¸°í??">
 <!ENTITY torbutton.cookiedialog.title "ì¿ í?¤ ë³´í?¸ ê´?ë¦¬">
 <!ENTITY torbutton.cookiedialog.lockCol "ë³´í?¸ë?¨">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ë³´í?¸ë?? ê²? ë¹¼ê³  ëª¨ë?? ì§?ì?°ê¸°">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ ë³´í?¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ë¥¼ ë³´í?¸í??ì§? ì??ì??">
-<!ENTITY torbutton.prefs.priv_caption "ê°?ì?¸ ì ?ë³´ ì?¤ì ?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "ë¸?ë?¼ì?°ì§? í??ì?¤í? ë¦¬ë?? ì?¹ì?¬ì?´í?¸ ë?°ì?´í?°ë¥¼ ê¸°ë¡?í??ì§? ë§?ì?ì??ì?¤ (Private Browsing ëª¨ë?? í??ì?±í??)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ì ? 3ì?? ì¿ í?¤ì?? ë?¤ë¥¸ ì¶?ì ? ë?°ì?´í?° ì ?í??">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "ë¸?ë?¼ì?°ì ? í??ë?¬ê·¸ì?¸ ë¹?í??ì?±í?? (ì?? : í??ë??ì??)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ë?¤ë¥¸ Tor browser ì?¬ì?©ì??ë¡?ë¶?í?° êµ¬ë³?ë??ë?? ì?¸ë¶? ì?¬í? ë³?ê²½">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "ë³´ì?? ë?±ê¸?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ì?¬ì?´í?¸ ë?´ì?¥ í?°í?¸ê°? ì°¨ë?¨ë??ì??ì?µë??ë?¤.">
 <!ENTITY torbutton.prefs.sec_custom "ë§?ì¶¤ ê°?">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ko_KR/torbutton.dtd b/ko_KR/torbutton.dtd
index 548c52a..b197f36 100644
--- a/ko_KR/torbutton.dtd
+++ b/ko_KR/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton ì?¤ì ? ì´?ê¸°í??">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "ê¸°ë³¸ê°?ì?¼ë¡? ë??ë¦¼">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ku/torbutton.dtd b/ku/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ku/torbutton.dtd
+++ b/ku/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ku_IQ/torbutton.dtd b/ku_IQ/torbutton.dtd
index 7629113..7d93589 100644
--- a/ku_IQ/torbutton.dtd
+++ b/ku_IQ/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ú?Û?Ú©Ø®Ø³ØªÙ?Û?Ú©Ø§Ù?Û? Ú?Ø§Û?Û?ÚµÛ?Û? Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/kw/torbutton.dtd b/kw/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/kw/torbutton.dtd
+++ b/kw/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ky/torbutton.dtd b/ky/torbutton.dtd
index 1d9bea7..754488f 100644
--- a/ky/torbutton.dtd
+++ b/ky/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/la/torbutton.dtd b/la/torbutton.dtd
index 0c563f1..222b458 100644
--- a/la/torbutton.dtd
+++ b/la/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Circulus Tor novus pro ea pagina">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Praeferentiae abdititudinis certitudinisque...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Praeferentiae coniunctionis in Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Novitatem Tor navis quaerere">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Protectiones verborum informationis...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Preme murem pro initio de Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Praeferentiae abdititudinis certitudinisque">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Initia reponere">
 <!ENTITY torbutton.cookiedialog.title "Protectiones verborum informationis mutare...">
 <!ENTITY torbutton.cookiedialog.lockCol "Protectum">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Omna non protecta delere">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Verba nova informationis protegere">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Verba nova informationis non protegere">
-<!ENTITY torbutton.prefs.priv_caption "Praeferentiae abdititudinis">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Si electi, eae praeferentiae personam et historiam quaestionum tuam abditam esse adest. Commendatur a nobis, ut omnes praeferentias maneant pro usatione Toris in norma.">
-<!ENTITY torbutton.prefs.block_disk "Historiam navigandi et informationem paginarum non memorare (modum navigandi abditi init)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Id quadratum maneat electum, ut informationes mutabiles â?? sunt memoria temporaria historiaque navis, informationes parvae, historia acquisitionum, TLS certificationes in medio, licentiae paginarum â?? non memoretur.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Non liceant verba informationis partis tertiae et informatio pro insecutione alia">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Id quadratum maneat electum, ut possibilitates navis variae â?? sunt URL puncti, viae transmittendi ad omnes, memoria temporaria navis, informationes parvae, imagines paginae, initia HTTP Auth, praeconiunctiones coniunctionibus paginarum, localStorage, mediaSource URL, quaestiones OCSP, SharedWorkers, informationes positionum TLS â?? te insequi non possint.">
-<!ENTITY torbutton.prefs.block_plugins "Additiones navis (ut Flash) defacere">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Id quadratum maneat electum, ut omnes inditiones binariae initae non sint. Inditiones periculum abdititudinis sunt, quia eis facilior possunt te insequi.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Minutalia mutare, quis non ut usatores alii Tor navis es">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Id quadratum maneat electum, ut res de paginis latetae sint, quae unicae de te esse possunt. Sunt status electricitatis, fortitudo computatoris, positio litterarum, transferatio, locus inditionum, status coniunctionis, informatio tabulae, gradus magnitudis paginae, classes sententiarum scientes, colores systematis, potestas WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Gradus certitudinis">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Linea certitudinis nonnullas possibilitates navis defacere potest, quae navem facilior pro temtationibus faciunt.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Sententiae collationis litterarum de pagina acceptae non sunt.">
 <!ENTITY torbutton.prefs.sec_custom "Numeri sui">
 <!ENTITY torbutton.circuit_display.title "Circulus Tor pro ea pagina">
-
diff --git a/lb/torbutton.dtd b/lb/torbutton.dtd
index d69d268..5f262b8 100644
--- a/lb/torbutton.dtd
+++ b/lb/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Neien Tor-Pad fir des SÃ¤it">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "PrivatsphÃ¤r- an SÃ©cherheetsastellungen">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor Netzwierk Astellungen">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Sich no Tor Browser AktualisÃ©ierungen">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Schutzâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klickt fir den Torbutton ze aktivÃ©ieren">
-<!ENTITY torbutton.prefs.privacy_security_settings "PrivatsphÃ¤r- an SÃ©cherheetsastellungen">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "PrivatsphÃ¤rastellungen">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "SÃ©cherheetslevel">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Individuell WÃ¤erter">
 <!ENTITY torbutton.circuit_display.title "Den Tor Pad fir des SÃ¤it">
-
diff --git a/lg/torbutton.dtd b/lg/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/lg/torbutton.dtd
+++ b/lg/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ln/torbutton.dtd b/ln/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ln/torbutton.dtd
+++ b/ln/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/lo/torbutton.dtd b/lo/torbutton.dtd
index 26cb79d..91fb80d 100644
--- a/lo/torbutton.dtd
+++ b/lo/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "àº?àº²àº?àº?àº±à»?àº?àº?à»?àº²à»?àº?àº·àºàº?à»?àº²àº? Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "àº?àº§àº?àºªàºàº?àº?àº²àº?àº?àº±àº?àº?àº¸àº?à»?àº?àº?à»?àºàº?à»?àº§àº±àº? Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "àº?àº²àº?àº?à»?àºàº?àº?àº±àº? àº?àº¸àº?àº?àºµà»?">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "àº?àº²àº?àº?àº³àº?àº»àº?àº?à»?àº²àº?àº§àº²àº¡à»?àº?àº±àº?àºªà»?àº§àº?àº?àº»àº§à»?àº¥àº°àº?àº§àº²àº¡àº?àºàº?à»?àº?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "àº?àº²àº?àº?àº³àº?àº»àº?àº?à»?àº²àº?àº§àº²àº¡à»?àº?àº±àº?àºªà»?àº§àº?à»?àº?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "àº¥àº°àº?àº±àº?àº?àº§àº²àº¡àº?àºàº?à»?àº?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "àº?àº²àº?àº¥à»? àº®àº¹àº?à»?àº?àº?à»?àº?à»?àº±àº?àºªàº· àº?àºµà»?à»?àº§àº±àº?à»?àº?àº?à»?àºªàº°à»?àºàº?à»?àº«à»? àº?àº·àº?àº¥àº±àº?à»?àº§à»?.">
 <!ENTITY torbutton.prefs.sec_custom "àº?àº³àº?àº»àº?àº?à»?àº²à»?àºàº?">
 <!ENTITY torbutton.circuit_display.title "àº§àº»àº?àº?àºàº? Tor àºªàº³àº¥àº±àº?à»?àº§àº±àº?à»?àº?àº?àºµà»?">
-
diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd
index ace5d48..4b54c80 100644
--- a/lt/torbutton.dtd
+++ b/lt/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nauja Tor grandinÄ? Å¡iam tinklalapiui">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Privatumo ir saugumo nustatymai...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor tinklo nustatymai...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tikrinti ar yra Tor narÅ¡yklÄ?s atnaujinimÅ³...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "SlapukÅ³ apsaugos...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "SpustelÄ?kite, kad aktyvuotumÄ?te Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privatumo ir saugumo nustatymai">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Atstatyti numatytuosius">
 <!ENTITY torbutton.cookiedialog.title "Tvarkyti slapukÅ³ apsaugas">
 <!ENTITY torbutton.cookiedialog.lockCol "Apsaugotas">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Å alinti visus, iÅ¡skyrus apsaugotus">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Apsaugoti naujus slapukus">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neapsaugoti naujÅ³ slapukÅ³">
-<!ENTITY torbutton.prefs.priv_caption "Privatumo nustatymai">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "NeÄ¯raÅ¡inÄ?ti narÅ¡ymo Å¾urnalo ir svetainiÅ³ duomenÅ³ (Ä¯jungia privataus narÅ¡ymo veiksenÄ?)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Neleisti treÄ?iÅ³jÅ³ Å¡aliÅ³ slapukÅ³ ir kitÅ³ sekimo duomenÅ³">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "IÅ¡jungti narÅ¡yklÄ?s papildinius (tokius kaip Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Pakeisti informacijÄ?, kuri iÅ¡skiria jus iÅ¡ kitÅ³ Tor Browser naudotojÅ³">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Saugumo lygmuo">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Tinklalapio teikiami Å¡riftai blokuojami.">
 <!ENTITY torbutton.prefs.sec_custom "Tinkintos reikÅ¡mÄ?s">
 <!ENTITY torbutton.circuit_display.title "Tor grandinÄ? Å¡iam tinklalapiui.">
-
diff --git a/lv/torbutton.dtd b/lv/torbutton.dtd
index 6c49d87..e641778 100644
--- a/lv/torbutton.dtd
+++ b/lv/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Jauns Tor marÅ¡ruts Å¡ai vietnei">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "PrivÄ?tuma un droÅ¡Ä«bas iestatÄ«jumi.">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "TÄ«kla Tor iestatÄ«jumi.">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "PÄ?rbaudÄ«t atjauninÄ?jumus pÄ?rlÅ«kam Tor.">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "AizsardzÄ«ba pret sÄ«kdatnÄ?m.">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "NoklikÅ¡Ä·inÄ?t, lai inicializÄ?tu Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "PrivÄ?tuma un droÅ¡Ä«bas iestatÄ«jumi">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!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">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "NoÅ?emt visas, izÅ?emot aizsargÄ?tÄ?s">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "AizsargÄ?t jaunÄ?s sÄ«kdatnes">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NeaizsargÄ?t jaunÄ?s sÄ«kdatnes">
-<!ENTITY torbutton.prefs.priv_caption "PrivÄ?tuma iestatÄ«jumi">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "MÄ?s pÄ?rbaudijÄ?m, un Å¡ie iestatÄ«jumi palÄ«dz nodroÅ¡inÄ?t JÅ«su identitÄ?tes un pÄ?rlÅ«koÅ¡anas vÄ?stures privÄ?tumu. MÄ?s stingri iesakÄ?m, ka, normÄ?li lietojot pÄ?rlÅ«ku Tor, atzÄ«mÄ?jat visas privÄ?tuma lodziÅ?us.">
-<!ENTITY torbutton.prefs.block_disk "NereÄ£istrÄ?t pÄ?rlÅ«koÅ¡anas vÄ?sturi vai tÄ«mekÄ¼a vietÅ?u datus (iespÄ?jo PrivÄ?tas pÄ?rlÅ«koÅ¡anas reÅ¾Ä«mu)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "AtzÄ«mÄ?jiet Å¡o lodziÅ?u, lai izvairÄ«tos no sensitÄ«vu datu noglabÄ?Å¡anas diskÄ?, tostarp pÄ?rlÅ«ka keÅ¡atmiÅ?as, JÅ«su pÄ?rlÅ«koÅ¡anas vÄ?stures, sÄ«kdatÅ?u datu bÄ?zes, JÅ«su lejuplÄ?Å¾u vÄ?stures, TLS starpnieksertifikÄ?tu un tÄ«mekÄ¼a vietnÄ?m sniegto atÄ¼auju.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "IerobeÅ¾ot treÅ¡o personu sÄ«kdatnes un citus izsekoÅ¡anas datus">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "AtzÄ«mÄ?jiet Å¡o lodziÅ?u, lai neatÄ¼autu daÅ¾Ä?du pÄ?rlÅ«ka iezÄ«mju Ä¼aunprÄ?tÄ«gu izmantoÅ¡anu JÅ«su izsekoÅ¡anai tÄ«mekÄ¼a pÄ?rlÅ«koÅ¡anas laikÄ?. ModificÄ?tas iezÄ«mes ietver BLOB vietrÄ?Å¾us, pÄ?rraides kanÄ?lus, pÄ?rlÅ«ka keÅ¡atmiÅ?u, sÄ«kdatnes, izlases ikonas, HTTP Auth galvenes, saiÅ¡u pirmssavienojumus, localStorage, mediaSource vietrÄ?Å¾us, OCSP pieprasÄ«jumus, SharedWorkers un TLS sesiju biÄ¼etes.">
-<!ENTITY torbutton.prefs.block_plugins "AtspÄ?jot pÄ?rlÅ«ku spraudÅ?us (tÄ?dus kÄ? Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "AtzÄ«mÄ?jiet Å¡o lodziÅ?u, lai neatÄ¼autu jebkÄ?du binÄ?ru spraudÅ?u ielÄ?dÄ?Å¡anu. SpraudÅ?i ir nopietns droÅ¡Ä«bas apdraudÄ?jums, jo tie var nopludinÄ?t JÅ«su pÄ?rlÅ«koÅ¡anas vÄ?sturi vai citÄ?di padarÄ«t JÅ«s par viegli izsekojamu.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "MainÄ«t informÄ?ciju, kura dara JÅ«s atÅ¡Ä·irÄ«gus no citiem PÄ?rlÅ«ka Tor lietotÄ?jiem">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "AtzÄ«mÄ?jiet Å¡o lodziÅ?u, lai paslÄ?ptu no tÄ«mekÄ¼a vietnÄ?m lietas, kas var JÅ«s identificÄ?t, tostarp JÅ«su baterijas statusu, datora veiktspÄ?ju, klaviatÅ«ras izvietojumu, lokalizÄ?ciju, instalÄ?to spraudÅ?u lokalizÄ?ciju, JÅ«su tÄ«kla stÄ?vokli, ekrÄ?na orientÄ?ciju, ekrÄ?na izmÄ?ru, vietai raksturÄ«gos tÄ?lummaiÅ?as lÄ«meÅ?us, atbalstÄ«tos datÅ?u veidus, sistÄ?mas krÄ?sas im WebGL iespÄ?jas.">
 <!ENTITY torbutton.prefs.sec_caption "DroÅ¡Ä«bas lÄ«menis">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Security Slider jeb DroÅ¡Ä«bas slÄ«dnis Ä¼auj Jums atspÄ?jot tÄ?s pÄ?rlÅ«ka iezÄ«mes, kas padara JÅ«su pÄ?rlÅ«ku ievainojamÄ?ku datorpirÄ?tisma mÄ?Ä£inÄ?jumiem.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Tiek bloÄ·Ä?tas tÄ«mekÄ¼a lapu sniegtÄ?s fontu datnes.">
 <!ENTITY torbutton.prefs.sec_custom "PielÄ?gotas vÄ?rtÄ«bas">
 <!ENTITY torbutton.circuit_display.title "Å Ä«s vietnes Tor marÅ¡ruts">
-
diff --git a/mg/torbutton.dtd b/mg/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/mg/torbutton.dtd
+++ b/mg/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/mi/torbutton.dtd b/mi/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/mi/torbutton.dtd
+++ b/mi/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/mk/torbutton.dtd b/mk/torbutton.dtd
index 3670d6e..1bae5e5 100644
--- a/mk/torbutton.dtd
+++ b/mk/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "Z">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "Z">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ð?Ð»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð·Ð° Ð¸Ð½Ð¸Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð½Ð° Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ml/torbutton.dtd b/ml/torbutton.dtd
index d403e92..148b3d3 100644
--- a/ml/torbutton.dtd
+++ b/ml/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "à´?àµ?à´¾àµ¼ à´¨àµ?à´±àµ?à´±àµ?à´µàµ¼à´?àµ?à´?àµ? à´?àµ?à´°à´®àµ?à´?à´°à´£à´?àµ?à´?àµ¾ ...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "à´?àµ?à´¾àµ¼ à´¬àµ?à´°àµ?àµ?à´¸àµ¼ à´?à´ªàµ?à´¡àµ?à´±àµ?à´±àµ? à´ªà´°à´¿à´¶àµ?à´¾à´§à´¿à´?àµ?à´?àµ?à´? ...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "à´?àµ?à´?àµ?à´?à´¿ à´¸à´?à´°à´?àµ?à´·à´£à´?àµ?à´?àµ¾ ...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "à´¸àµ?à´µà´?à´¾à´°àµ?à´¯à´¤, à´¸àµ?à´°à´?àµ?à´·à´¾ à´?àµ?à´°à´®àµ?à´?à´°à´£à´?àµ?à´?àµ¾">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "à´¸àµ?à´µà´?à´¾à´°àµ?à´¯à´¤à´¾ à´?àµ?à´°à´®àµ?à´?à´°à´£à´?àµ?à´?àµ¾">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à´¸àµ?à´°à´?àµ?à´·à´¾ à´²àµ?à´µàµ½">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip " à´«à´¯à´²àµ?à´?àµ¾ à´¤à´?à´?àµ?à´?àµ? à´µàµ?à´¬àµ?à´¸àµ?à´±àµ?à´±àµ?-à´¨àµ½à´?à´¿à´¯ à´«àµ?à´¾à´£àµ?à´?àµ?.">
 <!ENTITY torbutton.prefs.sec_custom "à´?à´¸àµ?à´±àµ?à´±à´? à´®àµ?à´²àµ?à´¯à´?àµ?à´?àµ¾">
 <!ENTITY torbutton.circuit_display.title "à´? à´¸àµ?à´±àµ?à´±à´¿à´¨à´¾à´¯à´¿ à´?àµ?à´¾àµ¼ à´¸àµ¼à´?àµ?à´¯àµ?à´?àµ?à´?àµ?">
-
diff --git a/mn/torbutton.dtd b/mn/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/mn/torbutton.dtd
+++ b/mn/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/mr/torbutton.dtd b/mr/torbutton.dtd
index 5a278c7..6b07c03 100644
--- a/mr/torbutton.dtd
+++ b/mr/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "à¤?à¥?à¤ªà¤¨à¥?à¤¯à¤¤à¤¾ à¤?à¤£à¤¿ à¤¸à¥?à¤°à¤?à¥?à¤·à¤¾ à¤¸à¥?à¤?à¤¿à¤?à¤?à¥?à¤? ...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "à¤?à¥?à¤° à¤¨à¥?à¤?à¤µà¤°à¥?à¤? à¤¸à¥?à¤?à¤¿à¤?à¤?à¥?à¤? ...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "à¤?à¥?à¤?à¥? à¤¸à¤?à¤°à¤?à¥?à¤·à¤£ ...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "à¤?à¥?à¤ªà¤¨à¥?à¤¯à¤¤à¤¾ à¤?à¤£à¤¿ à¤¸à¥?à¤°à¤?à¥?à¤·à¤¾ à¤¸à¥?à¤?à¤¿à¤?à¤?à¥?à¤?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "à¤?à¥?à¤ªà¤¨à¥?à¤¯à¤¤à¤¾ à¤¸à¥?à¤?à¤¿à¤?à¤?à¥?à¤?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à¤¸à¥?à¤°à¤?à¥?à¤·à¤¾ à¤¸à¥?à¤¤à¤°">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "à¤?à¤¸à¥?à¤?à¤® à¤®à¥?à¤²à¥?à¤¯à¥?">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ms_MY/torbutton.dtd b/ms_MY/torbutton.dtd
index 027e613..2c0ffd1 100644
--- a/ms_MY/torbutton.dtd
+++ b/ms_MY/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klik untuk memulakan Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Kembalikan tetapan asal">
 <!ENTITY torbutton.cookiedialog.title "Mengurus Perlindungan Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Buang Semua Kecuali Yang Dilindungi">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Lindungi Cookies Baru">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Jangan Melindungi Cookies Baru">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Matikan pelayar plugin (seperti Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ubah butir-butir yang membezakan anda daripada pengguna lain Pelayar Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/mt/torbutton.dtd b/mt/torbutton.dtd
index 158e2ab..8388b70 100644
--- a/mt/torbutton.dtd
+++ b/mt/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protett">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/my/torbutton.dtd b/my/torbutton.dtd
index 2e1c6e2..8823a22 100644
--- a/my/torbutton.dtd
+++ b/my/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton á??á?á?¯ á?¡á??á??á?¼á?¯á??á??á?º á??á?¾á?á??á?ºá??á?«á??">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults " á??á?°á??á?¡á??á?á?¯á??á?ºá?¸ á??á?¼á??á?ºá??á?¬á?¸á??á??á?º">
 <!ENTITY torbutton.cookiedialog.title "á??á?½á??á?ºá??á?®á?¸ á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?á?¯ á??á?®á??á?¶á??á??á?ºá?·á??á?½á?²á??á??á?º">
 <!ENTITY torbutton.cookiedialog.lockCol "á?¡á??á?¬á?¡á??á?½á??á?º á??á?¯á??á?ºá??á?¬á?¸á??á??á?º">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?á?¯ á??á??á?ºá??á?¯á??á?ºá??á?«á?? á??á?á?¯á?·á??á?±á?¬á?º á?¡á??á?¬á?¡á??á?½á??á?º á??á?¯á??á?ºá??á?¬á?¸á??á??á?º">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¬á??á?½á??á?ºá??á??á?º">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¬á??á?½á??á?ºá??á?¼á??á?ºá?¸ á??á??á?¼á?¯á??á??á?º">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "á??á?¯á?¶á??á?¼á?¯á?¶â??á??á?±á?¸á?¡á??á??á?ºá?·">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "á??á?á??á?ºá??á?¼á?á?¯á??á?ºá??á??á?ºá??á?á?¯á?¸">
 <!ENTITY torbutton.circuit_display.title "á?¤á??á?á?¯á??á?ºá?¡á??á?½á??á?º Tor á??á??á?ºá??á??á?ºá?¸">
-
diff --git a/nah/torbutton.dtd b/nah/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/nah/torbutton.dtd
+++ b/nah/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/nap/torbutton.dtd b/nap/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/nap/torbutton.dtd
+++ b/nap/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/nb/torbutton.dtd b/nb/torbutton.dtd
index c8346d4..b616ef8 100644
--- a/nb/torbutton.dtd
+++ b/nb/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Personvern og sikkerhetsinnstillinger...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Nettverksinnstillinger for TORâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for TOR-nettleserâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsels-beskyttelseâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klikk for Ã¥ igangsette Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Personvern og sikkerhetsinnstillinger">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Gjenopprett forvalg">
 <!ENTITY torbutton.cookiedialog.title "Administrer beskyttelse av informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle bortsett fra beskyttede">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt nye informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke beskytt nye informasjonskapsler">
-<!ENTITY torbutton.prefs.priv_caption "Personvernsinnstillinger">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "NÃ¥r det er merket, er fÃ¸lgende innstillinger bidra til Ã¥ holde din identitet og leserlogg privat. Vi anbefaler sterkt at du beholder alle personlige bokser sjekket for normal Tor Browser bruk.">
-<!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleserÃ¸kt)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Hold denne boksen sjekket for Ã¥ unngÃ¥ spar sensitive data pÃ¥ disken, inkludert nettleser cache, nettleserloggen , cookie database, nedlastingshistorikk, middels TLS-sertifikater, og tillatelser du har gitt til nettsteder.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata.">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hold denne boksen sjekket for Ã¥ forebygge ulike nettleserfunksjoner blir misbrukt til Ã¥ spore deg nÃ¥r du surfer pÃ¥ nettet. Modifiserte funksjoner inkluderer blob webadresser, kringkasting kanaler, nettleserens cache, cookies, favicon, HTTP Autentiserings overskrifter, link preconnects, localstorage , Mediasource webadresser, OCSP forespÃ¸rsler, SharedWorkers og TLS Ã¸ktbilletter.">
-<!ENTITY torbutton.prefs.block_plugins "Skru av nettlesertillegg (som f.eks Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Hold denne boksen avkrysset for Ã¥ stoppe alle binÃ¦re plugins fra Ã¥ bli lastet. Plugins er en seriÃ¸s privatliv risiko, fordi de kan lekke nettleserloggen eller pÃ¥ annen mÃ¥te gjÃ¸re deg lett Ã¥ spore.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre brukere av Tor-nettleseren.">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hold denne boksen sjekket for Ã¥ skjule ting fra nettsteder som kan vÃ¦re unikt med deg, inkludert batteristatus, datamaskinens ytelse, tastaturoppsett , lokalitet, plasseringen av installerte plugins, listen over installerte plugins, nettverksstatus, skjermretning , skjermstÃ¸rrelse , stedsspesifikk zoomnivÃ¥er , filtyper som stÃ¸ttes, system farger og WebGL evner.">
 <!ENTITY torbutton.prefs.sec_caption "SikkerhetsnivÃ¥">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Fonter som kommer fra nettsiden er blokkert.">
 <!ENTITY torbutton.prefs.sec_custom "Egendefinerte verdier">
 <!ENTITY torbutton.circuit_display.title "Tor-krets for denne siden">
-
diff --git a/nds/torbutton.dtd b/nds/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/nds/torbutton.dtd
+++ b/nds/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ne/torbutton.dtd b/ne/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ne/torbutton.dtd
+++ b/ne/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index c9fff3a..a23ded6 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy- en beveiligingsinstellingen...">
-<!ENTITY torbutton.context_menu.preferences.key "V">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor netwerk instellingen">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie beveiligingen...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy- en beveiligingsinstellingen">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Terugzetten op begintoestand">
 <!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen">
 <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Verwijder alle behalve beveiligde">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe Cookies niet">
-<!ENTITY torbutton.prefs.priv_caption "Privacyinstellingen">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Bewaar geen surfgeschiedenis of websitegegevens. (Schakelt PrivÃ©navigatie in.)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Schakel browserplug-ins uit (zoals Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypes worden geblokkeerd.">
 <!ENTITY torbutton.prefs.sec_custom "Aangepaste waarden">
 <!ENTITY torbutton.circuit_display.title "Tor circuit voor deze website">
-
diff --git a/nl_BE/torbutton.dtd b/nl_BE/torbutton.dtd
index f5a3770..7607ef0 100644
--- a/nl_BE/torbutton.dtd
+++ b/nl_BE/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Standaardinstellingen Herstellen">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/nn/torbutton.dtd b/nn/torbutton.dtd
index 2e1a333..58bf444 100644
--- a/nn/torbutton.dtd
+++ b/nn/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Personvern- og tryggingsinnstillingar â?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Innstillingar for Tor-nettverket">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "SjÃ¥ etter oppdatering for Tor Browser â?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Infokapselvern â?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Personvern- og tryggingsinnstillingar">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Personverninnstillingar">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "TryggingsnivÃ¥">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "SjÃ¸lvvalde verdiar">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/nso/torbutton.dtd b/nso/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/nso/torbutton.dtd
+++ b/nso/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/oc/torbutton.dtd b/oc/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/oc/torbutton.dtd
+++ b/oc/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/om/torbutton.dtd b/om/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/om/torbutton.dtd
+++ b/om/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/or/torbutton.dtd b/or/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/or/torbutton.dtd
+++ b/or/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/pa/torbutton.dtd b/pa/torbutton.dtd
index b550fa4..ab1990c 100644
--- a/pa/torbutton.dtd
+++ b/pa/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "p">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "à¨?à©?à¨°à¨¬à¨?à¨¨ à¨¶à©?à¨°à©? à¨?à¨°à¨¨ à¨²à¨? à¨?à¨²à¨¿à©±à¨? à¨?à¨°à©?">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "à¨®à©?à¨² à¨®à©?à©?-à¨¸à¨?à©?à¨° à¨?à¨°à©?">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "à¨ªà¨°à¨¾à¨?à¨µà©?à¨¸à©? à¨¸à©?à¨?à¨¿à©°à¨?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/pap/torbutton.dtd b/pap/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/pap/torbutton.dtd
+++ b/pap/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/pl/torbutton.dtd b/pl/torbutton.dtd
index 38d84ac..e2f0731 100644
--- a/pl/torbutton.dtd
+++ b/pl/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 PrywatnoÅ?ci i BezpieczeÅ?stwa...">
-<!ENTITY torbutton.context_menu.preferences.key "U">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ustawienia Sieci Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "s">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "SprawdÅº czy sÄ? aktualizacje Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "u">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrona plikÃ³w cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "c">
 <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomiÄ? Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Ustawienia prywatnoÅ?ci i bezpieczeÅ?stwa">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ustawienia domyÅ?lne">
 <!ENTITY torbutton.cookiedialog.title "ZarzÄ?dzaj ochronÄ? ciasteczek">
 <!ENTITY torbutton.cookiedialog.lockCol "Chronione">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "UsuÅ? wszystkie oprÃ³cz chronionych">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ChroÅ? nowe ciasteczka">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nie chroÅ? nowych ciasteczek">
-<!ENTITY torbutton.prefs.priv_caption "Ustawienia PrywatnoÅ?ci">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Nie zapisuj historii przeglÄ?dania i danych o stronach (wÅ?Ä?cza Tryb Prywatny)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane sÅ?uÅ¼Ä?ce do Å?ledzenia">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "WyÅ?Ä?cz wtyczki przeglÄ?darki (takie jak Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ZmieÅ? szczegÃ³Å?y odrÃ³Å¼niajÄ?ce CiÄ? od innych uÅ¼ytkownikÃ³w PrzeglÄ?darki Tora">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeÅ?stwa">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Pliki czcionek dostarczane przez strony internetowe sÄ? blokowane.">
 <!ENTITY torbutton.prefs.sec_custom "WartoÅ?ci niestandardowe">
 <!ENTITY torbutton.circuit_display.title "ObwÃ³d Tor dla tej strony">
-
diff --git a/pms/torbutton.dtd b/pms/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/pms/torbutton.dtd
+++ b/pms/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ps/torbutton.dtd b/ps/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ps/torbutton.dtd
+++ b/ps/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd
index d5e141c..c34459d 100644
--- a/pt/torbutton.dtd
+++ b/pt/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "ConfiguraÃ§Ãµes de SeguranÃ§a e Privacidade...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Procurar por atualizaÃ§Ãµes do Navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "ProteÃ§Ãµes de Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "ConfiguraÃ§Ãµes de Privacidade e SeguranÃ§a">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restaurar PredefiniÃ§Ãµes">
 <!ENTITY torbutton.cookiedialog.title "Gerir ProteÃ§Ãµes dos Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o Proteger Novos Cookies">
-<!ENTITY torbutton.prefs.priv_caption "ConfiguraÃ§Ãµes de Privacidade">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou os dados do site da Web (ativa o Modo de NavegaÃ§Ã£o Privado)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Desativar extensÃµes de navegador (tal como Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que o diferencia dos outros utilizadores do Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "NÃvel de SeguranÃ§a">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Os ficheiros dos tipos de letra fornecidos pelo site da Web estÃ£o bloqueados.">
 <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor para este site">
-
diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index ac53dc6..3c596d7 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 Privacidade e SeguranÃ§a...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Verificar atualizaÃ§Ãµes do Navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ProteÃ§Ãµes contra Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "ConfiguraÃ§Ãµes de Privacidade e SeguranÃ§a">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restaurar padrÃµes">
 <!ENTITY torbutton.cookiedialog.title "Gerenciar ProteÃ§Ãµes de Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
@@ -24,18 +24,14 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o Proteger Novos Cookies">
-<!ENTITY torbutton.prefs.priv_caption "ConfiguraÃ§Ãµes de Privacidade">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Quando selecionadas, as seguintes configuraÃ§Ãµes ajudam a manter a sua identidade e o seu histÃ³rico de navegaÃ§Ã£o privados. NÃ³s recomendamos-lhe marcar todas as opÃ§Ãµes de privacidade para um uso adequado do Navegador Tor .">
-<!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou dados do website (permite NavegaÃ§Ã£o em Modo Privado)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Deixe esta opÃ§Ã£o sempre marcada para evitar salvar dados sensÃvel no disco duro, o que inclui o cache de memÃ³ria, seu histÃ³rico de navegaÃ§Ã£o, a base de dados de cookies, o seu histÃ³rico de download, certificados intermediÃ¡rios TLS, e permissÃµes que vocÃª deu a sites web.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Deixe esta opÃ§Ã£o sempre marcada para impedir que funcionalidades de navegaÃ§Ã£o sejam usadas para rastreÃ¡-la(o) durante a sua navegaÃ§Ã£o. Funcionalidades alteradas incluem janelas pop-up, canais de transmissÃ£o, o cache de memÃ³ria, cookies, favicons, ">
-<!ENTITY torbutton.prefs.block_plugins "Desabilitar plugins do navegador (como o Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Deixe esta opcao marcada para impedir que plugins binÃ¡rios carreguem-se. Plugins sÃ£o um sÃ©rio risco para a privacidade, pois eles divulgam o seu histÃ³rico de navigacao, ou entÃ£o facilitam o seu rastreamento. ">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes  que distinguem vocÃª de outros usuÃ¡rios do Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Deixe esta opÃ§Ã£o marcada para ocultar suas informaÃ§Ãµes individuais, como o status da bateria, a performance do computados, o formato de teclado, a localizaÃ§Ã£o e os plugins instalados, a lista de plugins instalados, o status da sua rede, a posiÃ§Ã£o de tela, o tamanho de tela, nÃveis de zoom de alguns sites, tipos de arquivos compatÃveis, cores de sistema, e capacidade de WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "NÃvel de SeguranÃ§a">
-<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider permite que vocÃª desabilite certas funcionalidades de navegacao que podem tornÃ¡-la mais vulnerÃ¡vel a tentativas de ataque.">
 <!ENTITY torbutton.prefs.sec_low "Baixo (padrÃ£o)">
 <!ENTITY torbutton.prefs.sec_low_usable_desc "Isto proporciona a experiÃªncia mais utilizÃ¡vel.">
 <!ENTITY torbutton.prefs.sec_low_desc "Nesse nÃvel de seguranÃ§a, todas as funÃ§Ãµes do navegador sÃ£o ativadas. ">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Arquivos de fontes fornecidos pelo sÃtio web estÃ£o bloqueados.">
 <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor para este site">
-
diff --git a/ro/torbutton.dtd b/ro/torbutton.dtd
index a1af9a5..b86a0b4 100644
--- a/ro/torbutton.dtd
+++ b/ro/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "l">
 <!ENTITY torbutton.context_menu.new_circuit "Circuit Tor nou pentru acest site">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "ConfigurÄ?ri de securitate È?i intimitate...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "ConfigurÄ?ri reÈ?eaua Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "VerificÄ? pentru actualizÄ?ri navigator Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "ProtecÈ?ie cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "ApasÄ? pentru pornirea Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "ConfigurÄ?ri de intimitate È?i securitate">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "RestaureazÄ? setÄ?rile implicite">
 <!ENTITY torbutton.cookiedialog.title "GestioneazÄ? ProtecÅ£ii Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protejat">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Indeparteaza tot, mai putin protejat">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi">
-<!ENTITY torbutton.prefs.priv_caption "ConfigurÄ?ri de intimitate">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "DacÄ? sunt bifate, urmÄ?toarele setÄ?ri ajutÄ? la protejarea identitÄ?È?ii tale È?i a istoricului de navigare. RecomandÄ?m menÈ?inerea tuturor cÄ?suÈ?elor referitoare la confidenÈ?ialitate bifate pentru utilizarea normalÄ? a browser-ului Tor.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "MenÈ?ine bifarea acestei cÄ?suÈ?e pentru a evita salvarea informaÈ?iilor sensibile pe disc, inclusiv cache-ul browser-ului, istoricul tÄ?u de navigare, baza de date de cookies, istoricul de descÄ?rcÄ?ri, certificate intermediare TLS È?i permisiuni oferite de tine pentru anumite pagini.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "MenÈ?ine bifarea acestei cÄ?suÈ?e pentru a preveni ca anumite caracteristici ale browser-ului sÄ? fie folosite abuziv, pentru a te urmÄ?ri Ã®n timp ce navighezi pe web. Caracteristici modificate incluc URL-uri blob, canale de transmisie, cache-ul browser-ului, cookies, favicons, header HTTP Auth, link preconnects, localStorage, URL-uri mediaSource, solicitÄ?ri OCSP, SharedWorkers È?i tichete de sesiuni TLS.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "MenÈ?ine bifarea acestei cÄ?suÈ?e pentru a opri Ã®ncÄ?rcarea tuturor puling-urilor binare. Plugin-urile reprezintÄ? un risc semnificativ din punct de vedere al confidenÈ?ialitÄ?È?ii, dat fiind cÄ? pot oferi informaÈ?ii despre istoricul de navigare sau te pot face uÈ?or de urmÄ?rit.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "MenÈ?ine bifarea acestei cÄ?suÈ?e pentru a ascunde anumite informaÈ?ii de pagini web care ar putea sÄ? fie unice pentru tine, inclusiv stadiul bateriei, performanÈ?a computerului, configuraÈ?ia tastaturii, locaÈ?ia, locaÈ?ia plugin-urilor instalate, lista plugin-urilor instalate, stadiul reÈ?elei tale, orientarea ecranului, mÄ?rimea ecranului, trepte de zoom specifice unei anumite pagini, tipuri de fiÈ?iere suportate, culorile sistemului È?i capacitÄ?È?ile WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Nivel securitate">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "OpÈ?iunea Security Slider Ã®È?i permite sÄ? dezactivezi anumite caracteristici ale browser-ului care Ã®È?i fac browser-ul mai vulnerabil Ã®n faÈ?a unor tentative de hacking.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "FiÈ?ierele font oferite de site sunt blocate.">
 <!ENTITY torbutton.prefs.sec_custom "Valori personalizate">
 <!ENTITY torbutton.circuit_display.title "Circuit Tor pentru acest site">
-
diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd
index 016342c..2c76a91 100644
--- a/ru/torbutton.dtd
+++ b/ru/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Ð?">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ñ?ÐµÑ?Ð¸ Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð½Ð° Ð½Ð°Ð»Ð¸Ñ?Ð¸Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Tor Browser">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð°Ñ?Ð¸Ñ?Ð° ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ð°">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ ÐºÐ¾Ð½Ñ?Ð¸Ð´ÐµÐ½Ñ?Ð¸Ð°Ð»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ð¾Ð¹ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ð¾Ð²">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð²Ñ?Ðµ, ÐºÑ?Ð¾Ð¼Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð½Ð½Ñ?Ñ?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ?">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ?">
-<!ENTITY torbutton.prefs.priv_caption "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ ÐºÐ¾Ð½Ñ?Ð¸Ð´ÐµÐ½Ñ?Ð¸Ð°Ð»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ð?Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ñ?Ð¸Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐµÐ½Ð¸Ð¹ Ð¸ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ? Ð¿Ð¾Ñ?ÐµÑ?Ð°ÐµÐ¼Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð¾Ð² (Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ñ?ÐµÑ? Ñ?Ñ?Ð½ÐºÑ?Ð¸Ñ? ÐºÐ¾Ð½Ñ?Ð¸Ð´ÐµÐ½Ñ?Ð¸Ð°Ð»Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð°)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ð¸Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ? Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ð»ÐµÐ¶ÐµÐ½Ð¸Ñ?">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½Ð¸Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° (Ñ?Ð°ÐºÐ¸Ðµ ÐºÐ°Ðº Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ?, Ð¾Ñ?Ð»Ð¸Ñ?Ð°Ñ?Ñ?Ð¸Ðµ Ð²Ð°Ñ? Ð¾Ñ? Ð´Ñ?Ñ?Ð³Ð¸Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¹ Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ð£Ñ?Ð¾Ð²ÐµÐ½Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ð¤Ð°Ð¹Ð»Ñ? Ñ?Ñ?Ð¸Ñ?Ñ?Ð¾Ð², Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ Ñ?Ð°Ð¹Ñ?Ð¾Ð¼, Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ñ?">
 <!ENTITY torbutton.prefs.sec_custom "Ð¡Ð¾Ð±Ñ?Ñ?Ð²ÐµÐ½Ð½Ñ?Ðµ Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ?">
 <!ENTITY torbutton.circuit_display.title "Ð¦ÐµÐ¿Ð¾Ñ?ÐºÐ° Tor Ð´Ð»Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ð°Ð¹Ñ?Ð°">
-
diff --git a/ru@petr1708/torbutton.dtd b/ru@petr1708/torbutton.dtd
index be2c9b9..5169e8e 100644
--- a/ru@petr1708/torbutton.dtd
+++ b/ru@petr1708/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Ð¯">
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "Ð?Ðª">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ð?Ð½Ð¸Ñ?Ñ?Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?Ð¾Ð·Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð·Ð½Ð°Ñ?ÐµÐ½Ñ?Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ñ?Ñ?">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ñ?Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ð¾Ð¹ Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾">
@@ -33,15 +33,11 @@
 Ð½Ð¾Ð²Ñ?Ðµ
 
  Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ð?Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ñ? Ð¾Ð±Ð¾Ð·Ñ?Ñ£Ð²Ð°Ñ?ÐµÐ»Ñ? Ð¸ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ? Ð¿Ð¾Ñ?Ñ£Ñ?Ð°ÐµÐ¼Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð¾Ð²Ñ? (Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ñ?ÐµÑ?Ñ? Ñ?Ñ?Ð½ÐºÑ?Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð°Ð³Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð°)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ñ?Ñ? ÐºÑ?ÐºÐ¸ Ð¸ Ð´Ñ?Ñ?Ð³Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ð»Ñ£Ð¶ÐµÐ½Ñ?Ñ?">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° (Ñ?Ð°ÐºÑ?Ðµ ÐºÐ°ÐºÑ? Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ð?Ð·Ð¼Ñ£Ð½Ð¸Ñ?Ñ? Ñ?Ð²Ñ£Ð´Ñ£Ð½Ñ?Ñ?, Ð¾Ñ?Ð»Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ñ? Ð¾Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¸Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¹ Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -73,4 +69,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/scn/torbutton.dtd b/scn/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/scn/torbutton.dtd
+++ b/scn/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/sco/torbutton.dtd b/sco/torbutton.dtd
index 3848f6f..6234a63 100644
--- a/sco/torbutton.dtd
+++ b/sco/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Clap tae ineetialise Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defauts">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Fendins">
 <!ENTITY torbutton.cookiedialog.lockCol "Fendit">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remui Aw But Fendit">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Fend New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Dinna Fend New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Dinna record brousin histerie or wabsteid data (enables Preevate Brousin Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third pairtie cookies n ither trackin data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable brouser plugins (lyk Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish ye fae ither Tor Brouser uisers">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/si_LK/torbutton.dtd b/si_LK/torbutton.dtd
index 88bfb54..f07ce17 100644
--- a/si_LK/torbutton.dtd
+++ b/si_LK/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton à¶¸à·?à¶½à¶´à·?à¶»à·?à¶¸à¶§ à¶?à·?à¶½à·?à¶?à·? à¶?à¶»à¶±à·?à¶±">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "à¶´à·?à¶»à¶±à·?à¶¸à·? à¶¯à·? à¶´à·?â??à¶»à¶à·?à·?à·?à¶®à·?à¶´à¶±à¶º à¶?à¶»à¶±à·?à¶± ">
 <!ENTITY torbutton.cookiedialog.title "à¶?à·?à¶?à·? à¶?à¶»à¶?à·?à·?à¶« à¶?à·?à¶¸à¶±à·?à¶?à¶»à¶«à¶º à¶?à¶»à¶±à·?à¶±">
 <!ENTITY torbutton.cookiedialog.lockCol "à¶?à¶»à¶?à·?â??à·?à·?à¶">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "à¶?à¶»à¶?à·?â??à·?à·?à¶ à¶?à·?à·? à·?à·?à¶» à¶?à¶±à·?à¶à·? à·?à·?à¶ºà¶½à·?à¶½à¶¸ à¶?à·?à¶à·? à¶?à¶»à¶±à·?à¶±">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "à¶±à·? à¶?à·?à¶?à·? à¶?à¶»à¶?à·?à·?à·? à¶?à¶»à¶±à·?à¶±">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "à¶±à·? à¶?à·?à¶?à·? à¶?à¶»à¶?à·?à·?à·? à¶±à·?à¶?à¶»à¶±à·?à¶±">
-<!ENTITY torbutton.prefs.priv_caption "à¶´à·?à¶¯à·?à¶?à¶½à·?à¶? à·?à·?à¶§à·?à·?à¶¸à·? ">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "à·?à·?à·?à·?à¶¸à·? à¶?à¶à·?à·?à·?à·?à¶º à·?à·? à·?à·?à¶¶à·?à¶?à¶©à·?à·? à¶¯à¶à·?à¶ à·?à·?à¶»à·?à¶à·? à¶±à·?à¶?à¶»à¶±à·?à¶± (à¶´à·?à¶¯à·?à¶?à¶½à·?à¶? à·?à·?à·?à·?à¶¸à·? à¶¸à·?à¶°à·?â??à¶º à¶?à·?â??à¶»à·?à¶ºà·?à¶à·?à¶¸à¶? à¶?à¶»à¶ºà·?)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "à¶à·?à·?à¶± à¶´à·?à¶»à·?à·?à·? à¶?à·?à¶?à·? à·?à·? à¶?à¶±à·?à¶?à·? à¶?à·?à¶ºà·?à¶±à·?à·?à¶»à¶« à¶¯à¶à·?à¶ à¶?à¶à·?à·?à·?à¶§à·?à·?à¶±à·?à¶±">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "à¶¶à·?â??à¶»à·?à·?à·?à¶» à¶´à·?à¶±à·? à¶¸à·?à¶¯à·?à¶?à·?à¶?à¶? à¶?à¶?à·?â??à¶»à·?à¶º à¶?à¶»à¶±à·?à¶± (à·?à·?à¶½à·?à·?à·? à·?à·?à¶±à·?)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "à¶?à¶±à·?à¶à·? Tor à¶¶à·?â??à¶»à·?à·?à·?à¶» à¶·à·?à·?à·?à¶à·? à¶?à¶»à¶±à·?à¶±à¶±à·?à¶?à·?à¶±à·? à¶?à¶¶ à·?à·?à¶±à·? à¶?à¶» à·?à¶¯à·?à¶±à·?à¶?à¶±à·?à¶±à·? à·?à·?à·?à·?à¶à¶» à·?à·?à¶±à·?à·? à¶?à¶»à¶±à·?à¶±">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/sk/torbutton.dtd b/sk/torbutton.dtd
index 8744482..812add6 100644
--- a/sk/torbutton.dtd
+++ b/sk/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Nastavenia SÃºkromia a BezpeÄ?nosti...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "SieÅ¥ovÃ© Nastavenia Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "SkontrolovaÅ¥ aktualizÃ¡cie Tor Browsera">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrana Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Nastavenia SÃºkromia a BezpeÄ?nosti">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "ObnoviÅ¥ predvolenÃ©">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Nastavenia SÃºkromia">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Level BezpeÄ?nosti">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -66,4 +62,3 @@ Press TAB to Save and go to next string">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "VlastnÃ© parametre">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index b4e8d4f..ecb980d 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "NovÃ½ Tor obvod pre tÃºto strÃ¡nku">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Nastavenia sÃºkromia a bezpeÄ?nostnÃ© nastavenia...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Nastavenia siete Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "HÄ¾adaj aktualizÃ¡cie pre prehliadaÄ? Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrana Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "KliknutÃm zaveÄ?te Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Nastavenia sÃºkromia a bezpeÄ?nostnÃ© nastavenia">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "ObnoviÅ¥ pÃ´vodnÃ©">
 <!ENTITY torbutton.cookiedialog.title "SpravovaÅ¥ Ochranu cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "ChrÃ¡nenÃ©">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "OdstrÃ¡niÅ¥ vÅ¡etky okrem chrÃ¡nenÃ½ch">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "OchrÃ¡niÅ¥ novÃ© Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NechrÃ¡niÅ¥ novÃ© Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Nastavenia sÃºkromia">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "NezaznamenÃ¡vaÅ¥ histÃ³riu prehliadania ani Ãºdaje strÃ¡nok (zapne mÃ³d SÃºkromnÃ©ho prehliadania)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ObmedziÅ¥ cookies tretÃch strÃ¡n a Ä?alÅ¡ie stopovacie Ãºdaje">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "ZakÃ¡zaÅ¥ prÃpojnÃ© moduly prehliadaÄ?a (napr. Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ZmeniÅ¥ detaily, ktorÃ© vÃ¡s odliÅ¡ujÃº od ostatnÃ½ch uÅ¾ÃvateÄ¾ov Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "BezpeÄ?nostnÃ¡ hladina">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "PÃsma poskytnutÃ© webovovou strÃ¡nkou boli zablokovanÃ©.">
 <!ENTITY torbutton.prefs.sec_custom "VlastnÃ© hodnoty">
 <!ENTITY torbutton.circuit_display.title "Tor obvod pre tÃºto strÃ¡nku">
-
diff --git a/sl/torbutton.dtd b/sl/torbutton.dtd
index 5ca5c0d..d1412d1 100644
--- a/sl/torbutton.dtd
+++ b/sl/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razÅ¡iritve Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Privzete nastavitve">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ne zaÅ¡Ä?iti novih piÅ¡kotkov">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/sl_SI/torbutton.dtd b/sl_SI/torbutton.dtd
index c50e85b..abadc4a 100644
--- a/sl_SI/torbutton.dtd
+++ b/sl_SI/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Novo Tor vezje za to stran">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Zasebnostne in varnostne nastavitve...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Nastavitve Tor omreÅ¾ja...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Preveri posodobitve Tor brskalnika">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Varnosti piÅ¡kotkov...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klik za zaÄ?etek Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Nastavitve zasebnosti in varnosti">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Obnovi privzeto">
 <!ENTITY torbutton.cookiedialog.title "Upravljaj zaÅ¡Ä?ito piÅ¡kotkov">
 <!ENTITY torbutton.cookiedialog.lockCol "ZaÅ¡Ä?iteno">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Odstrani vse razen zaÅ¡Ä?itenih">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ZaÅ¡Ä?iti Nove piÅ¡kotke">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne zaÅ¡Ä?iti Novih piÅ¡kotkov">
-<!ENTITY torbutton.prefs.priv_caption "Nastavitve zasebnosti">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ne zapisuj zgodovine brskanja ali podatke strani ( omogoÄ?eno zasebno brskanje)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Omeji piÅ¡kotke tretjih oseb in druge podatke o sledenju">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "OnemogoÄ?i vtiÄ?nike brskalnika ( kot Flash )">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Spremeni podatke, ki vas loÄ?ijo od drugih uporabnikov Tor Browser">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Varnostni nivo">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Vrednosti po meri">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/sn/torbutton.dtd b/sn/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/sn/torbutton.dtd
+++ b/sn/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/so/torbutton.dtd b/so/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/so/torbutton.dtd
+++ b/so/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/son/torbutton.dtd b/son/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/son/torbutton.dtd
+++ b/son/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd
index 54be9a4..69c7def 100644
--- a/sq/torbutton.dtd
+++ b/sq/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "NjÃ« Cirkuit i Ri Tor pÃ«r kÃ«tÃ« Webfaqe">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Konfigurimi i PrivatÃ«sisÃ« dhe SigurisÃ«â?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Konfigurimi i Rrjetit Torâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Kontrolloni pÃ«r PÃ«rditÃ«sime tÃ« Shfletuesit Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Mbrojtjet nga Cookie-tâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Klikoni qÃ« ta nisni Torbutton-in">
-<!ENTITY torbutton.prefs.privacy_security_settings "Konfigurimi i PrivatÃ«sisÃ« dhe SigurisÃ«">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Rivendoseni Parazgjedhjen">
 <!ENTITY torbutton.cookiedialog.title "Administroni Mbrojtjen e Cookie-ve">
 <!ENTITY torbutton.cookiedialog.lockCol "I mbrojtur">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Hiqini tÃ« GjithÃ« PÃ«rveÃ§ tÃ« Mbrojturve">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Mbrojini Cookie-t e Rinj">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Mos i Mbroni Cookie-t e Rinj">
-<!ENTITY torbutton.prefs.priv_caption "Parametrat e fshehtÃ«sisÃ«">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Mos regjistroni historinÃ« e kÃ«rkimit ose tÃ« dhÃ«nat e webfaqes (aktivizon MÃ«nyrÃ«n e Shfletimit Privatisht)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Kufizojini cookie-t e palÃ«ve tÃ« treta dhe tÃ« dhÃ«nat e tjera gjurmuese">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "PaaftÃ«soni shtojcat e shfletuesit (siÃ§ Ã«shtÃ« Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ndryshojini hollÃ«sitÃ« qÃ« ju dallojnÃ« nga pÃ«rdoruesit e tjerÃ« tÃ« Shfletuesit Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Niveli i sigurisÃ«">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "SkedarÃ«t e germave tÃ« ofruara nga webfaqja janÃ« penguar.">
 <!ENTITY torbutton.prefs.sec_custom "Vlera tÃ« PÃ«rshtatura">
 <!ENTITY torbutton.circuit_display.title "Cirkuiti i Tor-it pÃ«r kÃ«tÃ« webfaqe">
-
diff --git a/sr/torbutton.dtd b/sr/torbutton.dtd
index cecadd3..d146315 100644
--- a/sr/torbutton.dtd
+++ b/sr/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "Ð?">
 <!ENTITY torbutton.context_menu.new_circuit "Ð?Ð¾Ð² Ð¢Ð¾Ñ? Ð¡Ð¿Ð¾Ñ? Ð·Ð° Ð¾Ð²Ð°Ñ? Ð¡Ð°Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.new_circuit_key "Ð¦">
-<!ENTITY torbutton.context_menu.preferences "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¸ Ð?ÐµÐ·Ð±ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸...">
-<!ENTITY torbutton.context_menu.preferences.key "Ð?">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð?Ñ?ÐµÐ¶Ðµ...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ð?Ð¾Ñ?Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð·Ð° Ð¢Ð¾Ñ? Ð?Ñ?Ð°Ñ?Ð·ÐµÑ?...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð°Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð´ Ð?Ð¾Ð»Ð°Ñ?Ð¸Ñ?Ð°...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "Ð¦">
 <!ENTITY torbutton.button.tooltip "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ð»Ð¸ Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð·Ð° Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ? Ð¸ Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾Ñ?Ñ?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?Ð¾Ð²Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ñ?ÐµÐ´Ð¸ Ð·Ð°Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð»Ð°Ñ?Ð¸Ñ?Ð°">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ñ?Ð²Ðµ Ð¾Ñ?Ð¸Ð¼ Ð·Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½Ð¸Ñ?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?Ð°Ñ?Ñ?Ð¸Ñ?Ð¸ Ð½Ð¾Ð²Ðµ ÐºÐ¾Ð»Ð°Ñ?Ð¸Ñ?Ðµ">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?Ðµ Ñ?Ñ?Ð¸Ñ?Ð¸ Ð½Ð¾Ð²Ðµ ÐºÐ¾Ð»Ð°Ñ?Ð¸Ñ?Ðµ">
-<!ENTITY torbutton.prefs.priv_caption "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ne pamti moji istoriju pretrazivanja ili podatke sa web sajtova(Omogucava Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "OnemogucÌ?i dodatke pretrazivaca (kao Å¡to su Flash )">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Promenite detalje koji vas razlikuju od drugih korisnika Tor pretrazivaca.">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ð?Ð¸Ð²Ð¾ Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Ð?Ð°Ð¼ÐµÐ½Ñ?ÐºÐµ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸">
 <!ENTITY torbutton.circuit_display.title "Ð¢Ð¾Ñ? Ñ?Ð¿Ð¾Ñ? Ð·Ð° Ð¾Ð²Ð°Ñ? Ñ?Ð°Ñ?Ñ?">
-
diff --git a/sr@latin/torbutton.dtd b/sr@latin/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/sr@latin/torbutton.dtd
+++ b/sr@latin/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/st/torbutton.dtd b/st/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/st/torbutton.dtd
+++ b/st/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/su/torbutton.dtd b/su/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/su/torbutton.dtd
+++ b/su/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index d5d3657..5851a63 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "N">
 <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets fÃ¶r den hÃ¤r webbsidan">
 <!ENTITY torbutton.context_menu.new_circuit_key "S">
-<!ENTITY torbutton.context_menu.preferences "InstÃ¤llningar fÃ¶r privatliv och sÃ¤kerhet...">
-<!ENTITY torbutton.context_menu.preferences.key "I">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor nÃ¤tverksinstÃ¤llningar...">
-<!ENTITY torbutton.context_menu.networksettings.key "Ã?">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "SÃ¶k efter uppdateringar fÃ¶r Tor webblÃ¤sare...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Skydd mot Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "S">
 <!ENTITY torbutton.button.tooltip "Klicka fÃ¶r att installera Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Integritet- och sÃ¤kerhetsinstÃ¤llningar">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ã?terstÃ¤ll till standard">
 <!ENTITY torbutton.cookiedialog.title "Hantera skyddade kakor">
 <!ENTITY torbutton.cookiedialog.lockCol "Skyddad">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ta bort alla icke-skyddade">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya kakor">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya kakor">
-<!ENTITY torbutton.prefs.priv_caption "SekretessinstÃ¤llningar">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "NÃ¤r de Ã¤r ikryssade sÃ¥ hjÃ¤lper fÃ¶ljande instÃ¤llningar till att hÃ¥lla din identitet och din surfhistoria privat. Vi rekommenderar starkt att du har alla rutor ikryssade vid normalt anvÃ¤ndande av Tor Browser. ">
-<!ENTITY torbutton.prefs.block_disk "Spara ingen historik eller webbplatsdata (aktiverar privat surfning)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Kryssa i den hÃ¤r rutan fÃ¶r att undvika att spara kÃ¤nslig data till disk, inklusive webblÃ¤sarcachen, din surfhistoria, cookiedatabasen, din nedladdningshistoria, mellanliggande TLS-certifikat, och tillstÃ¥nd du har gett till webbsiter.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "BegrÃ¤nsa tredjepartskakor och annan tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Inaktivera insticksmoduler (sÃ¥ som Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Kryssa i den hÃ¤r rutan fÃ¶r att hindra alla binÃ¤ra plugin frÃ¥n att laddas. Plugin Ã¤r en allvarlig integritetsrisk eftersom de kan lÃ¤cka din surfhistoria eller gÃ¶ra dig lÃ¤tt att spÃ¥ra pÃ¥ andra sÃ¤tt.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ã?ndra detailjer som utmÃ¤rker dig ifrÃ¥n andra Tor Browser anvÃ¤ndare">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "SÃ¤kerhetsnivÃ¥">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "SÃ¤kerhetsreglaget lÃ¥ter dig stÃ¤nga av vissa webblÃ¤sarfunktioner som kan gÃ¶ra din webblÃ¤sare mer sÃ¥rbar mot intrÃ¥ngsfÃ¶rsÃ¶k.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahÃ¥lls av webbsidor Ã¤r blockerade.">
 <!ENTITY torbutton.prefs.sec_custom "Anpassad nivÃ¥">
 <!ENTITY torbutton.circuit_display.title "Tor-krets fÃ¶r den hÃ¤r webbsidan">
-
diff --git a/sw/torbutton.dtd b/sw/torbutton.dtd
index 3e6f06e..9b2f648 100644
--- a/sw/torbutton.dtd
+++ b/sw/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Rejesha chaguo-msingi">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Zuia plugins za kisakuzi (kama vile Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Badilisha sifa zinazokutofautisha na wengine wanaotumia kisakuzi cha Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Kiwango cha Usalama">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Vipengele maalum">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/szl/torbutton.dtd b/szl/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/szl/torbutton.dtd
+++ b/szl/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ta/torbutton.dtd b/ta/torbutton.dtd
index 0d16358..60c4832 100644
--- a/ta/torbutton.dtd
+++ b/ta/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "à®¤à®©à®¿à®¯à¯?à®°à®¿à®®à¯? à®®à®±à¯?à®±à¯?à®®à¯? à®ªà®¾à®¤à¯?à®?à®¾à®ªà¯?à®ªà¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "à®¤à®©à®¿à®¯à¯?à®°à®¿à®®à¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à®¤à®©à®¿à®?à¯? à®¨à®¿à®²à¯?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "à®µà®¿à®°à¯?à®ªà¯?à®ª à®?à®²à®¾à®?à¯?à®?à®¾à®°à®®à¯?">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/te/torbutton.dtd b/te/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/te/torbutton.dtd
+++ b/te/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/te_IN/torbutton.dtd b/te_IN/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/te_IN/torbutton.dtd
+++ b/te_IN/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/tg/torbutton.dtd b/tg/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/tg/torbutton.dtd
+++ b/tg/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/th/torbutton.dtd b/th/torbutton.dtd
index d3557d8..194d08a 100644
--- a/th/torbutton.dtd
+++ b/th/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "A">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "à¸?à¹?à¸²à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢  à¸?à¸?à¸?">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "à¸?à¸£à¸§à¸?à¸ªà¸à¸?à¸ªà¸?à¸²à¸?à¸°à¸?à¸²à¸£à¸?à¸£à¸±à¸?à¸?à¸£à¸¸à¸? Tor à¹?à¸?à¸£à¸²à¸§à¹?à¹?à¸?à¸à¸£à¹?">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "à¸?à¸²à¸£à¸?à¸?à¸?à¹?à¸à¸?à¸?à¸¸à¸?à¸?à¸µà¹?">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "à¸?à¸²à¸£à¸?à¸±à¹?à¸?à¸?à¹?à¸² à¸?à¸§à¸²à¸¡à¹?à¸?à¹?à¸?à¸ªà¹?à¸§à¸?à¸?à¸±à¸§ à¹?à¸¥à¸° à¸?à¸§à¸²à¸¡à¸?à¸¥à¸à¸?à¸ à¸±à¸¢">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¸?à¸§à¸²à¸¡à¹?à¸?à¹?à¸?à¸ªà¹?à¸§à¸?à¸?à¸±à¸§">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "à¸£à¸°à¸?à¸±à¸?à¸?à¸§à¸²à¸¡à¸?à¸¥à¸à¸?à¸ à¸±à¸¢">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "à¸?à¹?à¸²à¸?à¸µà¹?à¸?à¸³à¸«à¸?à¸?à¹?à¸à¸?">
 <!ENTITY torbutton.circuit_display.title "à¸§à¸?à¸?à¸£ Tor à¸ªà¸³à¸«à¸£à¸±à¸?à¹?à¸?à¸?à¹?à¸?à¸µà¹?">
-
diff --git a/ti/torbutton.dtd b/ti/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ti/torbutton.dtd
+++ b/ti/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/tk/torbutton.dtd b/tk/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/tk/torbutton.dtd
+++ b/tk/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index 1341866..e2e5975 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -2,16 +2,16 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Bu site iÃ§in Tor devresini yenile">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "Gizlilik ve GÃ¼venlik AyarlarÄ±...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor AÄ? AyarlarÄ±...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser GÃ¼ncelleme Denetimi...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ã?erez KorumasÄ±...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton uygulamasÄ±nÄ± baÅ?latmak iÃ§in tÄ±klayÄ±n">
-<!ENTITY torbutton.prefs.privacy_security_settings "Gizlilik ve GÃ¼venlik AyarlarÄ±">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lanlarÄ± YÃ¼kle">
 <!ENTITY torbutton.cookiedialog.title "Ã?erez KorumasÄ± YÃ¶netimi">
 <!ENTITY torbutton.cookiedialog.lockCol "KorunmuÅ?">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar DÄ±Å?Ä±nda TÃ¼mÃ¼nÃ¼ Sil">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Ã?erezleri Koru">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Ã?erezleri Koruma">
-<!ENTITY torbutton.prefs.priv_caption "Gizlilik AyarlarÄ±">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Bu seÃ§enek etkinleÅ?tirildiÄ?inde, aÅ?aÄ?Ä±daki ayarlar kimliÄ?inizi ve tarama geÃ§miÅ?inizi gizli tutmanÄ±zÄ± saÄ?lar. Normal Tor TarayÄ±cÄ± kullanÄ±mÄ± iÃ§in tÃ¼m kiÅ?isel gizlilik seÃ§eneklerini iÅ?aretli tutmanÄ±z Ã¶nerilir">
-<!ENTITY torbutton.prefs.block_disk "Tarama geÃ§miÅ?ini ve web sitesi bilgileri kaydedilmesin (Gizli Tarama Kipi kullanÄ±lÄ±r)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Bu seÃ§eneÄ?i iÅ?aretleyerek, web tarayÄ±cÄ±sÄ± Ã¶n belleÄ?i, tarama geÃ§miÅ?iniz, Ã§erezler veritabanÄ±, indirme geÃ§miÅ?iniz, ara TLS sertifikalarÄ± ve web sitelerine verdiÄ?iniz izinler gibi Ã¶nemli bilgilerin disk Ã¼zerine kaydedilmesini engelleyebilirsiniz. ">
 <!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf Ã§erez ve diÄ?er iz sÃ¼rÃ¼cÃ¼ bilgiler engellensin">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Bu seÃ§eneÄ?i iÅ?aretleyerek, Ã§eÅ?itli web tarayÄ±cÄ±larÄ±n, web sitelerinde yaptÄ±Ä?Ä±nÄ±z iÅ?lemleri izlemesini engelleyebilirsiniz. DeÄ?iÅ?tirilen Ã¶zellikler iÃ§inde blob Ä°nternet adresleri, yayÄ±n kanallarÄ±, web tarayÄ±cÄ± Ã¶n belleÄ?i, Ã§erezler, favicon dosyalarÄ±, HTTP Auth baÅ?lÄ±k bilgileri, Ã¶n baÄ?lantÄ± bilgileri, localStorage, mediaSource adresleri, OCSP istekleri, SharedWorkers ve TLS oturumu bulunur.">
-<!ENTITY torbutton.prefs.block_plugins "TarayÄ±cÄ± eklentileri engellensin (Flash gibi)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Bu seÃ§eneÄ?i iÅ?aretleyerek, binary uygulama eklerinin yÃ¼klenmesi engellenebilir. Tarama geÃ§miÅ?i bilgilerinizin sÄ±zmasÄ±na yol aÃ§arak izlenmenizi kolaylaÅ?tÄ±rabileceÄ?inden, uygulama ekleri Ã¶nemli bir gÃ¼venlik riski oluÅ?turur.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "DiÄ?er Tor Browser kullanÄ±cÄ±larÄ±ndan sizi ayÄ±ran ayrÄ±ntÄ±lar deÄ?iÅ?tirilsin">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bu seÃ§eneÄ?i iÅ?aretleyerek, web sitelerinden pil durumu, bilgisayar performansÄ±, tuÅ? takÄ±mÄ± dÃ¼zeni, yerel ayarlar, yÃ¼klÃ¼ uygulama eklerinin konumu, yÃ¼klÃ¼ uygulama eklerinin listesi, aÄ? durumunuz, ekran doÄ?rultusu, ekran boyutu, siteye Ã¶zel yakÄ±nlaÅ?tÄ±rma dÃ¼zeyi, desteklenen dosya tipleri, sistem renkleri ve WebGL yetenekleri gibi sizin iÃ§in Ã¶nemli olabilecek bilgileri gizleyebilirsiniz. ">
 <!ENTITY torbutton.prefs.sec_caption "GÃ¼venlik DÃ¼zeyi">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "GÃ¼venlik ayarÄ± ile belirli web tarayÄ±cÄ± Ã¶zeliklerini kapatabilirsiniz. Ancak bu durumda web tarayÄ±cÄ±nÄ±z saldÄ±rÄ±lara karÅ?Ä± daha korumasÄ±z olur.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web sitesi tarafÄ±ndan sunulan yazÄ± tipi dosyalarÄ± engellenir.">
 <!ENTITY torbutton.prefs.sec_custom "Ã?zel DeÄ?erler">
 <!ENTITY torbutton.circuit_display.title "Bu site iÃ§in Tor devresi">
-
diff --git a/tzm/torbutton.dtd b/tzm/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/tzm/torbutton.dtd
+++ b/tzm/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ug@Arab/torbutton.dtd b/ug@Arab/torbutton.dtd
index a5ac63d..5b47246 100644
--- a/ug@Arab/torbutton.dtd
+++ b/ug@Arab/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø®ØµÙ?ØµÙ?Ø©">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/uk/torbutton.dtd b/uk/torbutton.dtd
index 0e9eee3..76d5088 100644
--- a/uk/torbutton.dtd
+++ b/uk/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ð?ÐµÑ?ÐµÐ²Ñ?Ñ?Ñ?Ðµ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð°Ñ?Ð¸Ñ?Ñ? cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Ð?Ð»Ð°Ñ?Ð½Ñ?Ñ?Ñ? Ð´Ð»Ñ? Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ? Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ? Ñ?Ð° Ð±ÐµÐ·Ð¿ÐµÐºÐ¸">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ð?Ð° Ð?Ð°Ð¼Ð¾Ð²Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?Ð¼">
 <!ENTITY torbutton.cookiedialog.title "Ð?ÐµÑ?Ñ?Ð²Ð°Ñ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð¼ Ð?Ñ?ÐºÑ?Ð²">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð?Ð¸Ð´Ð°Ð»Ð¸Ñ?Ð¸ Ð£Ñ?Ñ?, Ð?ÐºÑ?Ñ?Ð¼ Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¸Ñ?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð?Ð¾Ð²Ñ? Ð?Ñ?ÐºÐ¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?Ðµ Ð?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð?Ð¾Ð²Ñ? Ð?Ñ?ÐºÐ¸">
-<!ENTITY torbutton.prefs.priv_caption "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð?Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Ð?Ðµ Ð·Ð±ÐµÑ?Ñ?Ð³Ð°Ñ?Ð¸ Ñ?Ñ?Ñ?Ð¾Ñ?Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ñ?Ð² Ð°Ð±Ð¾ Ð´Ð°Ð½Ñ? Ð· Ð²Ñ?Ð´Ð²Ñ?Ð´Ñ?Ð²Ð°Ð½Ð¸Ñ? Ñ?Ð°Ð¹Ñ?Ñ?Ð² (Ð°ÐºÑ?Ð¸Ð²Ñ?Ñ? Ñ?Ñ?Ð½ÐºÑ?Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ñ?)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?Ð»Ð¾ÐºÑ?Ð²Ð°Ñ?Ð¸ Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ñ? ÐºÑ?ÐºÐ¸ Ñ?Ð° Ñ?Ð½Ñ?Ñ? Ð´Ð°Ð½Ñ? Ð²Ñ?Ð´Ñ?Ñ?ÐµÐ¶ÐµÐ½Ð½Ñ?">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Ñ?Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð½Ñ? Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ?Ð° (Ñ?Ð°ÐºÑ? Ñ?Ðº Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ð?Ð¼Ñ?Ð½Ð¸Ñ?Ð¸ Ð²Ñ?Ð´Ð¾Ð¼Ð¾Ñ?Ñ?Ñ?, Ñ?Ð¾ Ð²Ñ?Ð´Ñ?Ñ?Ð·Ð½Ñ?Ñ?Ñ?Ñ? Ð²Ð°Ñ? Ð²Ñ?Ð´ Ñ?Ð½Ñ?Ð¸Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð² Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ?Ð° Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ð Ñ?Ð²ÐµÐ½Ñ? Ð±ÐµÐ·Ð¿ÐµÐºÐ¸">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ð¤Ð°Ð¹Ð»Ð¸ Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ð², Ð½Ð°Ð´Ð°Ð½Ñ? Ñ?Ð°Ð¹Ñ?Ð¾Ð¼, Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ñ?">
 <!ENTITY torbutton.prefs.sec_custom "Ð?ÐµÑ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ? Ð·Ð½Ð°Ñ?ÐµÐ½Ð½Ñ?">
 <!ENTITY torbutton.circuit_display.title "Ð¡Ñ?ÐµÐ¼Ð° Tor Ð´Ð»Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ð°Ð¹Ñ?Ñ?">
-
diff --git a/ur/torbutton.dtd b/ur/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ur/torbutton.dtd
+++ b/ur/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ur_PK/torbutton.dtd b/ur_PK/torbutton.dtd
index 5c8f88c..a447416 100644
--- a/ur_PK/torbutton.dtd
+++ b/ur_PK/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "Ø§Û?Ø³">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Ú?Û?Ù?Ø§Ù?Ù¹Ø³ Ù¾Ø± Ù?Ø§Ù¾Ø³ Ø¬Ø§Ø¦Û?Û?">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/uz/torbutton.dtd b/uz/torbutton.dtd
index 6959be1..811b43c 100644
--- a/uz/torbutton.dtd
+++ b/uz/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Andozalarni tiklash">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Himoyalangan">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/ve/torbutton.dtd b/ve/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/ve/torbutton.dtd
+++ b/ve/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/vi/torbutton.dtd b/vi/torbutton.dtd
index cc372bf..f3d7f41 100644
--- a/vi/torbutton.dtd
+++ b/vi/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 RiÃªng tÆ° vÃ  Báº£o máºt...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!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 "S">
+<!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...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Nhá»¯ng sá»± báº£o vá»? Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Báº¥m chuá»?t Ä?á»? khá»?i cháº¡y Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "CÃ i Ä?áº·t RiÃªng tÆ° vÃ  Báº£o máºt">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "KhÃ´i phá»¥c Máº·c Ä?á»?nh">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "CÃ i Ä?áº·t RiÃªng tÆ°">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "Khi Ä?Æ°á»£c kiá»?m tra, nhá»¯ng cÃ i Ä?áº·t bÃªn dÆ°á»?i giÃºp giá»¯ danh tÃnh cá»§a báº¡n vÃ  lá»?ch sá» duyá»?t Ä?Æ°á»£c riÃªng tÆ°. ChÃºng tÃ´i Ä?áº·c biá»?t khuyÃªn báº¡n nÃªn báº£o Ä?áº£m táº¥t cáº£ nhá»¯ng há»?p vá»? riÃªng tÆ° Ä?Æ°á»£c Ä?Ã¡nh dáº¥u cho viá»?c sá» dá»¥ng TrÃ¬nh duyá»?t Tor bÃ¬nh thÆ°á»?ng.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Báº£o Ä?áº£m há»?p nÃ y Ä?Æ°á»£c Ä?Ã¡nh dáº¥u Ä?á»? trÃ¡nh viá»?c lÆ°u nhá»¯ng dá»¯ liá»?u nháº¡y cáº£m vÃ o Ä?Ä©a, bao gá»?m bá»? nhá»? Ä?á»?m cá»§a trÃ¬nh duyá»?t, lá»?ch sá» duyá»?t cá»§a báº¡n, cÆ¡ sá»? dá»¯ liá»?u cookie, lá»?ch sá» táº£i vá»? cá»§a báº¡n, nhá»¯ng chá»©ng chá»? TLS trung gian, vÃ  nhá»¯ng sá»± cho phÃ©p báº¡n Ä?Ã£ cáº¥p cho nhá»¯ng trang web.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Báº£o Ä?áº£m há»?p nÃ y Ä?Æ°á»£c Ä?Ã¡nh dáº¥u Ä?á»? ngÄ?n nhá»¯ng tÃnh nÄ?ng khÃ¡c nhau cá»§a trÃ¬nh duyá»?t khÃ´ng bá»? lÃ m dá»¥ng Ä?á»? theo dÃµi báº¡n khi báº¡n duyá»?t web. Nhá»¯ng tÃnh nÄ?ng Ä?Æ°á»£c sá»a Ä?á»?i bao gá»?m nhá»¯ng blob URL, nhá»¯ng Ä?Æ°á»?ng dáº«n Ä?Æ°á»£c káº¿t ná»?i trÆ°á»?c, nÆ¡i lÆ°u trá»¯ ná»?i bá»?, URL nguá»?n trung gian, nhá»¯ng yÃªu cáº§u OCSP, SharedWorkers, vÃ  vÃ© cá»§a phiÃªn TLS.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Báº£o Ä?áº£m há»?p nÃ y Ä?Æ°á»£c Ä?Ã¡nh dáº¥u Ä?á»? cháº·n táº¥t cáº£ nhá»¯ng thá»© gáº¯n thÃªm dáº¡ng binary Ä?Æ°á»£c táº£i. Nhá»¯ng thá»© gáº¯n thÃªm lÃ  nhá»¯ng rá»§i ro nghiÃªm trá»?ng vá»? riÃªng tÆ° bá»?i chÃºng cÃ³ thá»? tiáº¿t lá»? lá»?ch sá» duyá»?t cá»§a báº¡n hoáº·c náº¿u khÃ´ng sáº½ lÃ m báº¡n dá»? dÃ ng bá»? theo dÃµi.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Báº£o Ä?áº£m há»?p nÃ y Ä?Æ°á»£c Ä?Ã¡nh dáº¥u Ä?á»? áº©n nhá»¯ng thá»© tá»« trang web mÃ  cÃ³ thá»? lÃ  duy nháº¥t vá»? báº¡n bao gá»?m tÃ¬nh tráº¡ng pin, hiá»?u suáº¥t mÃ¡y tÃnh, ná»?n bÃ n phÃm, nÆ¡i xáº£y ra, Ä?á»?a Ä?iá»?m cá»§a nhá»¯ng thá»© gáº¯n thÃªm Ä?Æ°á»£c cÃ i Ä?áº·t, danh sÃ¡ch nhá»¯ng thá»© gáº¯n thÃªm Ä?Æ°á»£c cÃ i Ä?áº·t, tÃ¬nh tráº¡ng máº¡ng lÆ°á»?i cá»§a báº¡n, hÆ°á»?ng xoay mÃ n hÃ¬nh, kÃch cá»¡ mÃ n hÃ¬nh, nhá»¯ng má»©c Ä?á»? phÃ³ng Ä?áº¡i riÃªng cá»§a trang, nhá»¯ng loáº¡i táºp tin Ä?Æ°á»£c há»? trá»£, nhá»¯ng mÃ u sáº¯c há»? thá»?ng, vÃ  nhá»¯ng kháº£ nÄ?ng WebGL.">
 <!ENTITY torbutton.prefs.sec_caption "Má»©c Ä?á»? Báº£o máºt">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Nhá»¯ng NgÆ°á»?i Ä?iá»?u chá»?nh an ninh Ä?á»? cho báº¡n vÃ´ hiá»?u má»?t vÃ i tÃnh nÄ?ng cá»§a trÃ¬nh duyá»?t mÃ  cÃ³ thá»? lÃ m trÃ¬nh duyá»?t cá»§a báº¡n dá»? bá»? tá»?n thÆ°Æ¡ng Ä?á»?i vá»?i nhá»¯ng cá»? gáº¯ng táº¥n cÃ´ng.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Nhá»¯ng táºp tin phÃ´ng chá»¯ do trang web cung cáº¥p bá»? cháº·n.">
 <!ENTITY torbutton.prefs.sec_custom "Nhá»¯ng giÃ¡ trá»? tÃ¹y chá»?nh">
 <!ENTITY torbutton.circuit_display.title "Ä?áº§u ná»?i Tor dÃ nh cho trang nÃ y.">
-
diff --git a/wa/torbutton.dtd b/wa/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/wa/torbutton.dtd
+++ b/wa/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/wo/torbutton.dtd b/wo/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/wo/torbutton.dtd
+++ b/wo/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-
diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd
index 9c1b573..3834145 100644
--- a/zh_CN/torbutton.dtd
+++ b/zh_CN/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor ç½?ç»?è®¾ç½®â?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser æ£?æ?¥æ?´æ?°â?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie ä¿?æ?¤â?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "ç?¹æ¤å??å§?å?? Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "é??ç§?ä¸?å®?å?¨è®¾ç½®">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "æ?¢å¤?é»?è®¤è®¾ç½®">
 <!ENTITY torbutton.cookiedialog.title "ç®¡ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?æ?¤">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨ç§»é?¤ä»?ä¿?ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?æ?¤æ?°ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?æ?¤æ?°ç?? Cookie">
-<!ENTITY torbutton.prefs.priv_caption "é??ç§?è®¾ç½®">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "é??ä¸å??ä»¥ä¸?è®¾ç½®å?¯ç?¨äº?ä¿?æ?¤èº«ä»½ä¿¡æ?¯å??æµ?è§?å??å?²é??ç§?ã??é??å¸¸æ??å?µä¸?ï¼?å¼ºç??å»ºè®®å?¨ä½¿ç?¨ Tor æµ?è§?å?¨æ?¶é??ä¸å?¨é?¨é??ç§?é??é¡¹ã??">
-<!ENTITY torbutton.prefs.block_disk "ç¦?æ¢è®°å½?æµ?è§?å??å?²æ??ç½?ç«?æ?°æ?®ï¼?å?¯ç?¨é??ç§?æµ?è§?æ¨¡å¼?ï¼?">
-<!ENTITY torbutton.prefs.block_disk_tooltip "é??ä¸è¯¥é??é¡¹å?¯é?¿å??å?¨ç¡¬ç??ä¸?ä¿?å?æ??æ??æ?°æ?®ï¼?å??æ?¬æµ?è§?å?¨ç¼?å?ï¼?æµ?è§?å??å?²ï¼?cookie æ?°æ?®åº?ï¼?ä¸?è½½è®°å½?ï¼?ä¸é?´ TLS è¯?ä¹¦ï¼?ä»¥å??ç?¨æ?·ç½?ç«?æ??æ??ã??">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?æ?°æ?®è·?è¸ªç¨?åº?">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "è¯¥é??é¡¹ç?¨äº?é?²æ¢æ»¥ç?¨æµ?è§?å?¨å??è?½è·?è¸ªç?¨æ?·ã??ä¿®æ?¹ç??å??è?½å??æ?¬ï¼?blob ç½?å??ï¼?å¹¿æ?é??é??ï¼?æµ?è§?å?¨ç¼?å?ï¼?cookieï¼?æ?¶è??å¤¹å?¾æ ?ï¼?HTTP éª?è¯?å¤´é?¨ï¼?é¢?è¿?æ?¥ï¼?localStorageï¼?mediaSource ç½?å??ï¼?OCSP è¯·æ±?ï¼?SharedWorker å?? TLS ä¼?è¯?ç¥¨è¯?ã??">
-<!ENTITY torbutton.prefs.block_plugins "ç¦?ç?¨æµ?è§?å?¨æ??ä»¶ï¼?æ¯?å¦? Flashï¼?">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "è¯¥é??é¡¹å?¯é?»æ¢å? è½½æ??æ??äº?è¿?å?¶æ??ä»¶ã??æ??ä»¶å?¯æ³?æ¼?æµ?è§?å??å?²è®°å½?æ??å¯¼è?´ç?¨æ?·æ?´æ??è¢«è·?è¸ªï¼?å? æ¤æ??ä»¶å¯¹é??ç§?æ?¯ä¸?ç§?ä¸¥é??å¨?è??ã??">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ä¿®æ?¹ Tor æµ?è§?å?¨ä¸å?¯å?ºå??ä½ ä¸?å?¶ä»? Tor ç?¨æ?·ç??ç»?è??ä¿¡æ?¯">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "è¯¥é??é¡¹å?¯é?²æ¢ç½?ç«?å??ç??å?¯è¯?å?«ç?¨æ?·ç??ä¿¡æ?¯ï¼?å??æ?¬ç?µæ± ç?¶æ??ï¼?è®¡ç®?æ?ºæ?§è?½ï¼?é?®ç??å¸?å±?ï¼?å?ºå??ï¼?æ??ä»¶å®?è£?ä½?ç½®ï¼?æ??ä»¶å??è¡¨ï¼?ç½?ç»?ç?¶æ??ï¼?å±?å¹?æ?¹å??å??å¤§å°?ï¼?ç?¹å®?ç½?ç«?ç¼©æ?¾æ¯?ä¾?ï¼?æ?¯æ??æ??ä»¶ç±»å??ï¼?ç³»ç»?é¢?è?²ï¼?ä»¥å?? WebGL å??è?½ã?? ">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?çº§">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "å®?å?¨æ»?å??å?¯ç¦?ç?¨æ??äº?æµ?è§?å?¨å??è?½ï¼?é?¿å??å? è¿?äº?å??è?½å¯¼è?´ç??æ¼?æ´?è??å??å?°æ?»å?»ã??">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ç¦?ç?¨ç½?ç«?æ??ä¾?ç??å?ä½?æ??ä»¶ã??">
 <!ENTITY torbutton.prefs.sec_custom "è?ªå®?ä¹?">
 <!ENTITY torbutton.circuit_display.title "ä¸ºæ¤ç«?ç?¹ä½¿ç?¨ç?? Tor çº¿è·¯">
-
diff --git a/zh_HK/torbutton.dtd b/zh_HK/torbutton.dtd
index 16e07af..cad03c1 100644
--- a/zh_HK/torbutton.dtd
+++ b/zh_HK/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?â?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "æª¢æ?¥Toræ´?è?¥è·¯ç?±ç??è¦½å?¨å??ç´?â?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookieä¿?è·â?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "æ?³è?½å?»å??å§?å??Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "ç§?é?±å??å®?å?¨è¨å®?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "å??å?°é ?è¨">
 <!ENTITY torbutton.cookiedialog.title "ç®¡ç??Cookieå??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?è·">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨å?ªé?¤ï¼?ä½?å??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?è·æ?°å??Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "å??ä¿?è·æ?°å??Cookie">
-<!ENTITY torbutton.prefs.priv_caption "ç§?é?±è¨å®?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "å??è¨?é??ç??è¦½æ·ç¨?æ??ç¶²ç«?è³?æ??(å??ç?¨ç§?é?±ç??è¦½æ¨¡å¼?)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹Cookieå??å?¶ä»?è·?è¹¤è³?æ??">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "å??ç?¨ç??è¦½å?¨å¤?æ??(ä¾?å¦?Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "æ?´æ?¹å?¯å??å?¥ä½ å??å?¶ä»?Toræ´?è?¥è·¯ç?±ç??è¦½å?¨ç?¨æ?¶å??ç´°ç¯?è³?æ??">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?ç´?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "å°?é??ç¶²ç«?æ??ä¾?å??å?å??ã??">
 <!ENTITY torbutton.prefs.sec_custom "è?ªè¨?">
 <!ENTITY torbutton.circuit_display.title "æ¤ç¶²ç«?å??Toræ´?è?¥è·¯ç?±ç·?è·¯">
-
diff --git a/zh_TW/torbutton.dtd b/zh_TW/torbutton.dtd
index 85201db..d01baec 100644
--- a/zh_TW/torbutton.dtd
+++ b/zh_TW/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "P">
+<!ENTITY torbutton.context_menu.preferences "Security Settingsâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "æª¢æ?¥æ´?è?¥è·¯ç?±ç??è¦½å?¨æ?´æ?°....">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie ä¿?è·">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "æ??ä¸?ä¸?ä»¥å??å§?å?? Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "é?±ç§?è??å®?å?¨è¨å®?">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "é??å??é ?è¨å?¼">
 <!ENTITY torbutton.cookiedialog.title "ç®¡ç?? Cookie ç??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?è·">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨å?ªé?¤ï¼?ä½?å??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?è·æ?°ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?è·æ?°ç?? Cookie">
-<!ENTITY torbutton.prefs.priv_caption "é?±ç§?æ¬?è¨å®?">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "ä¸?è¨?é??ç??è¦½æ·ç¨?è¨?é??æ??ç¶²ç«?è³?æ??(å??ç?¨é?±ç§?ç??è¦½æ¨¡å¼?)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?è¿½è¹¤è³?æ??">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "å??ç?¨ç??è¦½å?¨å¤?æ??ç¨?å¼?(å¦? Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "è®?æ?´å?¯ä»¥å??å?¥æ?¨è??å?¶ä»?æ´?è?¥è·¯ç?±ç??è¦½å?¨ä½¿ç?¨è??ç??è©³ç´°è³?è¨?">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?ç´?">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "é? ç«¯å?é«?å·²è¢«å°?é??">
 <!ENTITY torbutton.prefs.sec_custom "è?ªè¨?è¨å®?">
 <!ENTITY torbutton.circuit_display.title "æ?¬ç¶²ç«?ç?? Tor è¿´è·¯">
-
diff --git a/zu/torbutton.dtd b/zu/torbutton.dtd
index 92b6eed..0ea18e5 100644
--- a/zu/torbutton.dtd
+++ b/zu/torbutton.dtd
@@ -2,16 +2,16 @@
 <!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 "Privacy and Security Settingsâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "P">
+<!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 "S">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!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.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.security_settings "Security Settings">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
@@ -24,15 +24,11 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
-<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use.">
-<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
-<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites.">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
 <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
-<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
-<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Security Level">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
@@ -64,4 +60,3 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
-

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

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