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

[tor-commits] [torbutton/master] Bug 20244.5: Remove obsolete Privacy Settings group

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbutton/master] Bug 20244.5: Remove obsolete Privacy Settings group
From: gk@xxxxxxxxxxxxxx
Date: Mon, 17 Oct 2016 06:57:23 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 17 Oct 2016 02:57:56 -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: Arthur Edelstein <arthuredelstein@xxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit ea0d6dc4ebc59c594162202e142549356075a981
Author: Arthur Edelstein <arthuredelstein@xxxxxxxxx>
Date:   Tue Oct 4 23:42:00 2016 +0000

    Bug 20244.5: Remove obsolete Privacy Settings group
---
 src/chrome/content/preferences.js     |  3 ---
 src/chrome/content/preferences.xul    |  8 +++-----
 src/chrome/locale/af/torbutton.dtd    |  3 ---
 src/chrome/locale/ak/torbutton.dtd    |  3 ---
 src/chrome/locale/am/torbutton.dtd    |  3 ---
 src/chrome/locale/ar/torbutton.dtd    |  5 -----
 src/chrome/locale/arn/torbutton.dtd   |  3 ---
 src/chrome/locale/ast/torbutton.dtd   |  3 ---
 src/chrome/locale/az/torbutton.dtd    |  3 ---
 src/chrome/locale/be/torbutton.dtd    |  3 ---
 src/chrome/locale/bg/torbutton.dtd    |  3 ---
 src/chrome/locale/bms/torbutton.dtd   |  2 --
 src/chrome/locale/bn-IN/torbutton.dtd |  3 ---
 src/chrome/locale/bn/torbutton.dtd    |  3 ---
 src/chrome/locale/bo/torbutton.dtd    |  3 ---
 src/chrome/locale/br/torbutton.dtd    |  3 ---
 src/chrome/locale/bs/torbutton.dtd    |  3 ---
 src/chrome/locale/ca/torbutton.dtd    |  3 ---
 src/chrome/locale/cs/torbutton.dtd    |  3 ---
 src/chrome/locale/csb/torbutton.dtd   |  3 ---
 src/chrome/locale/cy/torbutton.dtd    |  3 ---
 src/chrome/locale/da/torbutton.dtd    |  3 ---
 src/chrome/locale/de/torbutton.dtd    |  5 -----
 src/chrome/locale/dz/torbutton.dtd    |  3 ---
 src/chrome/locale/el/torbutton.dtd    |  3 ---
 src/chrome/locale/en/torbutton.dtd    | 10 ++++------
 src/chrome/locale/eo/torbutton.dtd    |  3 ---
 src/chrome/locale/es/torbutton.dtd    |  5 -----
 src/chrome/locale/et/torbutton.dtd    |  3 ---
 src/chrome/locale/eu/torbutton.dtd    |  5 -----
 src/chrome/locale/fa/torbutton.dtd    |  5 -----
 src/chrome/locale/fi/torbutton.dtd    |  3 ---
 src/chrome/locale/fil/torbutton.dtd   |  3 ---
 src/chrome/locale/fo/torbutton.dtd    |  3 ---
 src/chrome/locale/fr/torbutton.dtd    |  5 -----
 src/chrome/locale/fur/torbutton.dtd   |  3 ---
 src/chrome/locale/fy/torbutton.dtd    |  3 ---
 src/chrome/locale/ga/torbutton.dtd    |  3 ---
 src/chrome/locale/gl/torbutton.dtd    |  3 ---
 src/chrome/locale/gu/torbutton.dtd    |  3 ---
 src/chrome/locale/gun/torbutton.dtd   |  3 ---
 src/chrome/locale/ha/torbutton.dtd    |  3 ---
 src/chrome/locale/he/torbutton.dtd    |  3 ---
 src/chrome/locale/hi/torbutton.dtd    |  3 ---
 src/chrome/locale/hr/torbutton.dtd    |  3 ---
 src/chrome/locale/ht/torbutton.dtd    |  3 ---
 src/chrome/locale/hu/torbutton.dtd    |  3 ---
 src/chrome/locale/hy/torbutton.dtd    |  3 ---
 src/chrome/locale/id/torbutton.dtd    |  3 ---
 src/chrome/locale/is/torbutton.dtd    |  3 ---
 src/chrome/locale/it/torbutton.dtd    |  5 -----
 src/chrome/locale/ja/torbutton.dtd    |  5 -----
 src/chrome/locale/jv/torbutton.dtd    |  3 ---
 src/chrome/locale/ka/torbutton.dtd    |  3 ---
 src/chrome/locale/km/torbutton.dtd    |  3 ---
 src/chrome/locale/kn/torbutton.dtd    |  3 ---
 src/chrome/locale/ko/torbutton.dtd    |  5 -----
 src/chrome/locale/ku/torbutton.dtd    |  3 ---
 src/chrome/locale/kw/torbutton.dtd    |  3 ---
 src/chrome/locale/ky/torbutton.dtd    |  3 ---
 src/chrome/locale/lb/torbutton.dtd    |  3 ---
 src/chrome/locale/lg/torbutton.dtd    |  2 --
 src/chrome/locale/ln/torbutton.dtd    |  3 ---
 src/chrome/locale/lo/torbutton.dtd    |  3 ---
 src/chrome/locale/lt/torbutton.dtd    |  3 ---
 src/chrome/locale/lv/torbutton.dtd    |  3 ---
 src/chrome/locale/mg/torbutton.dtd    |  3 ---
 src/chrome/locale/mi/torbutton.dtd    |  3 ---
 src/chrome/locale/mk/torbutton.dtd    |  3 ---
 src/chrome/locale/ml/torbutton.dtd    |  3 ---
 src/chrome/locale/mn/torbutton.dtd    |  3 ---
 src/chrome/locale/mr/torbutton.dtd    |  3 ---
 src/chrome/locale/ms/torbutton.dtd    |  3 ---
 src/chrome/locale/mt/torbutton.dtd    |  3 ---
 src/chrome/locale/my/torbutton.dtd    |  3 ---
 src/chrome/locale/nah/torbutton.dtd   |  3 ---
 src/chrome/locale/nap/torbutton.dtd   |  3 ---
 src/chrome/locale/nb/torbutton.dtd    |  3 ---
 src/chrome/locale/ne/torbutton.dtd    |  3 ---
 src/chrome/locale/nl/torbutton.dtd    |  5 -----
 src/chrome/locale/nn/torbutton.dtd    |  3 ---
 src/chrome/locale/nso/torbutton.dtd   |  3 ---
 src/chrome/locale/oc/torbutton.dtd    |  3 ---
 src/chrome/locale/or/torbutton.dtd    |  3 ---
 src/chrome/locale/pa/torbutton.dtd    |  3 ---
 src/chrome/locale/pap/torbutton.dtd   |  3 ---
 src/chrome/locale/pl/torbutton.dtd    |  5 -----
 src/chrome/locale/pms/torbutton.dtd   |  3 ---
 src/chrome/locale/ps/torbutton.dtd    |  3 ---
 src/chrome/locale/pt-BR/torbutton.dtd |  3 ---
 src/chrome/locale/pt/torbutton.dtd    |  5 -----
 src/chrome/locale/ro/torbutton.dtd    |  3 ---
 src/chrome/locale/ru/torbutton.dtd    |  5 -----
 src/chrome/locale/sco/torbutton.dtd   |  3 ---
 src/chrome/locale/sk/torbutton.dtd    |  3 ---
 src/chrome/locale/sl/torbutton.dtd    |  3 ---
 src/chrome/locale/so/torbutton.dtd    |  3 ---
 src/chrome/locale/son/torbutton.dtd   |  3 ---
 src/chrome/locale/sq/torbutton.dtd    |  3 ---
 src/chrome/locale/sr/torbutton.dtd    |  3 ---
 src/chrome/locale/st/torbutton.dtd    |  3 ---
 src/chrome/locale/su/torbutton.dtd    |  3 ---
 src/chrome/locale/sv/torbutton.dtd    |  5 -----
 src/chrome/locale/sw/torbutton.dtd    |  3 ---
 src/chrome/locale/ta/torbutton.dtd    |  3 ---
 src/chrome/locale/te/torbutton.dtd    |  3 ---
 src/chrome/locale/tg/torbutton.dtd    |  3 ---
 src/chrome/locale/th/torbutton.dtd    |  3 ---
 src/chrome/locale/ti/torbutton.dtd    |  3 ---
 src/chrome/locale/tk/torbutton.dtd    |  3 ---
 src/chrome/locale/tr/torbutton.dtd    |  5 -----
 src/chrome/locale/uk/torbutton.dtd    |  3 ---
 src/chrome/locale/ur/torbutton.dtd    |  3 ---
 src/chrome/locale/ve/torbutton.dtd    |  3 ---
 src/chrome/locale/vi/torbutton.dtd    |  5 -----
 src/chrome/locale/wa/torbutton.dtd    |  3 ---
 src/chrome/locale/wo/torbutton.dtd    |  3 ---
 src/chrome/locale/zh-CN/torbutton.dtd |  5 -----
 src/chrome/locale/zh-HK/torbutton.dtd |  3 ---
 src/chrome/locale/zh-TW/torbutton.dtd |  3 ---
 src/chrome/locale/zu/torbutton.dtd    |  3 ---
 121 files changed, 7 insertions(+), 400 deletions(-)

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index eb71019..28f5955 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -12,7 +12,6 @@ function torbutton_prefs_init(doc) {
 
     var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
 
-    // Privacy and security settings
     let sec_slider = doc.getElementById('torbutton_sec_slider');
     let sec_custom = doc.getElementById('torbutton_sec_custom');
     let custom_values = o_torprefs.getBoolPref('security_custom');
@@ -41,8 +40,6 @@ function torbutton_prefs_save(doc) {
     torbutton_log(2, "called prefs_save()");
     var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
 
-    // Privacy and Security Settings
-
     o_torprefs.setBoolPref('security_custom',
                            doc.getElementById('torbutton_sec_custom').checked);
     o_torprefs.setIntPref('security_slider',
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index 3a54635..62f649f 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -7,7 +7,7 @@
 <dialog id="torbutton-prefs"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
         xmlns:html="http://www.w3.org/1999/xhtml";
-        title="&torbutton.prefs.privacy_security_settings;"
+        title="&torbutton.prefs.security_settings;"
         buttons="accept,cancel,extra1"
         buttonlabelextra1="&torbutton.prefs.restore_defaults;"
         ondialogextra1="torbutton_prefs_reset_defaults();"
@@ -15,15 +15,13 @@
         onload="torbutton_prefs_init(document)"
         align="stretch"
         pack="center"
+        maxheight="350"
+        maxwidth="400"
         ondialogaccept="torbutton_prefs_save(document)" >
 
     <script type="application/x-javascript" src="torbutton_util.js"/>
     <script type="application/x-javascript" src="preferences.js"/>
     <vbox flex="1" align="stretch">
-        <groupbox>
-          <caption label="&torbutton.prefs.priv_caption;"
-                   tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/>
-        </groupbox>
         <groupbox align="stretch" flex="1"> <!-- security settings container -->
           <caption label="&torbutton.prefs.sec_caption;"/>
           <hbox flex="1" align="stretch">
diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ak/torbutton.dtd
+++ b/src/chrome/locale/ak/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/am/torbutton.dtd
+++ b/src/chrome/locale/am/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index 67e510c..e86ca90 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨Ù?Ø© ØªÙ?Ø±...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù?Ø§Ù?ØªØ±Ø§Ø¶Ù?Ø§Øª">
 <!ENTITY torbutton.cookiedialog.title "Ø¥Ø¯Ø§Ø±Ø© Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§Ù?ØÙ?Ø§Ù?Ø© Ù?Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø·">
 <!ENTITY torbutton.cookiedialog.lockCol "Ù?ØÙ?Ù?Ø©">
@@ -24,7 +20,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ø¥Ø²Ø§Ù?Ø© Ø§Ù?Ù?Ù? Ù?Ù?Ù? Ø§Ø³ØªÙ?Ø± Ù?Ù? Ø§Ù?ØÙ?Ø§Ù?Ø©">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ø§ØÙ? Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø· Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ù?Ø§ ØªØÙ? Ù?Ù?Ù?Ø§Øª ØªØ¹Ø±Ù?Ù? Ø§Ù?Ø§Ø±ØªØ¨Ø§Ø· Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©">
-<!ENTITY torbutton.prefs.priv_caption "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø®ØµÙ?ØµÙ?Ø©">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ØªÙ?Ù?Ù?Ø¯ Ø§Ù?Ù?Cookies Ø§Ù?Ø®Ø§ØµØ© Ø¨Ø§Ù?Ø·Ø±Ù? Ø§Ù?Ø«Ø§Ù?Ø« Ù? Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?ØªØªØ¨Ø¹ Ø§Ù?Ø£Ø®Ø±Ù?.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ØªØºÙ?Ù?Ø± Ø§Ù?ØªÙ?Ø§ØµÙ?Ù? Ø§Ù?ØªÙ? ØªÙ?Ù?Ø²Ù? Ø¹Ù? Ø§Ù?Ù?Ø³ØªØ®Ø¯Ù?Ù?Ù? Ø§Ù?Ø¢Ø®Ø±Ù?Ù? Ù?Ù?ØªØµÙ?Ø ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.sec_caption "Ù?Ø³ØªÙ?Ù? Ø§Ù?Ø£Ù?Ø§Ù?">
diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/arn/torbutton.dtd
+++ b/src/chrome/locale/arn/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ast/torbutton.dtd
+++ b/src/chrome/locale/ast/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd
index d583418..85999d7 100644
--- a/src/chrome/locale/az/torbutton.dtd
+++ b/src/chrome/locale/az/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "SeÃ§imlÉ?r...">
-<!ENTITY torbutton.context_menu.preferences.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/be/torbutton.dtd
+++ b/src/chrome/locale/be/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index be87171..d95c6d5 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Ð?Ð¾Ð²Ð° Ñ?Ð°Ð¼Ð¾Ð»Ð¸Ñ?Ð½Ð¾Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index 110938d..8a7c825 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -1,5 +1,3 @@
-<!ENTITY torbutton.context_menu.preferences "á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸ á??á??á??á?¹á?»á??á??á??á??á?ºá?¬á?¸">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Torbutton á??á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«">
diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/bn-IN/torbutton.dtd
+++ b/src/chrome/locale/bn-IN/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/bn/torbutton.dtd
+++ b/src/chrome/locale/bn/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/br/torbutton.dtd
+++ b/src/chrome/locale/br/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd
index 27f1723..0933934 100644
--- a/src/chrome/locale/bs/torbutton.dtd
+++ b/src/chrome/locale/bs/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Prioriteti...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tita kolaÄ?iÄ?a">
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index ad2cc9f..1ee6378 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Nova identitat">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "PreferÃ¨ncies...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "ProtecciÃ³ de les galetes">
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 93f1124..60b96de 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Nova identita">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
-<!ENTITY torbutton.context_menu.preferences "NastavenÃ...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrana pÅ?ed cookies">
diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/csb/torbutton.dtd
+++ b/src/chrome/locale/csb/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd
index 9251931..e3a3500 100644
--- a/src/chrome/locale/cy/torbutton.dtd
+++ b/src/chrome/locale/cy/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Dewisiadau">
-<!ENTITY torbutton.context_menu.preferences.key "p">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 22b4726..78f4a8e 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Ny identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Indstillinger...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Hent bundt-opdatering Tor Browser Bundle ...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser">
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 3544642..aff98bf 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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 "B">
-<!ENTITY torbutton.context_menu.preferences "PrivatssphÃ¤re- und Sicherheits-Einstellungen...">
-<!ENTITY torbutton.context_menu.preferences.key "E">
 <!ENTITY torbutton.context_menu.networksettings "Tor-Netzwerk-Einstellungen...">
-<!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Suche nach Tor-Browser-Aktualisierungen...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!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Ã¤re- und Sicherheits-Einstellungen">
 <!ENTITY torbutton.prefs.restore_defaults "Vorgabeeinstellungen wiederherstellen">
 <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten">
 <!ENTITY torbutton.cookiedialog.lockCol "GeschÃ¼tzt">
@@ -24,7 +20,6 @@
 <!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Ã¤ren-Einstellungen">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere Ã?berwachungsdaten einschrÃ¤nken">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Details Ã¤ndern, die Sie von anderen Tor-Browser-Benutzern unterscheiden">
 <!ENTITY torbutton.prefs.sec_caption "Sicherheitslevel">
diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/dz/torbutton.dtd
+++ b/src/chrome/locale/dz/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 69366e2..4b1bb43 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Î?ÎÎ± Î¤Î±Ï?Ï?Ï?Ï?Î·Ï?Î±">
 <!ENTITY torbutton.context_menu.new_identity_key "Î¤">
-<!ENTITY torbutton.context_menu.preferences "Î?Ï?Î¹Î»Î¿Î³ÎÏ?...">
-<!ENTITY torbutton.context_menu.preferences.key "Î?">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Î?Ï?Ï?Î· Ï?Î¿Ï? Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Î Ï?Î¿Ï?Ï?Î±Ï?Î¯Î± Cookies">
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 908c375..9fd9dae 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/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,8 +24,6 @@
 <!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.restrict_thirdparty "Restrict third party cookies and other tracking data">
 <!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.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd
index 9790100..e10afbb 100644
--- a/src/chrome/locale/eo/torbutton.dtd
+++ b/src/chrome/locale/eo/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Nova idento">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Agordojâ?¦">
-<!ENTITY torbutton.context_menu.preferences.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "P">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 95a6d5c..a945042 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "ConfiguraciÃ³n de red Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "G">
 <!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.restore_defaults "Restablecer valores predeterminados ">
 <!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegidas">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios del Navegador Tor">
 <!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad">
diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/et/torbutton.dtd
+++ b/src/chrome/locale/et/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 97a7d33..9d745a5 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Tor Sarearen Ezarpenak...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "Lehenetsiak berrezarri">
 <!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu">
 <!ENTITY torbutton.cookiedialog.lockCol "Babestuta">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu">
 <!ENTITY torbutton.prefs.sec_caption "Segurtasun maila">
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 28ae8ce..cfe1f66 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù?Ø¯Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø¨Ù? ØØ§Ù?Øª Ù¾Û?Ø´â??Ù?Ø±Ø¶">
 <!ENTITY torbutton.cookiedialog.title "Ù?Ø¯Ù?Ø±Ù?Øª ØÙ?Ø§Ø¸Øª Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§">
 <!ENTITY torbutton.cookiedialog.lockCol "ØÙ?Ø§Ø¸Øª Ø´Ø¯Ù?">
@@ -24,7 +20,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ØØ°Ù? ØªÙ?Ø§Ù? Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§Û? ØÙ?Ø§Ø¸Øª Ù?Ø´Ø¯Ù?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ØÙ?Ø§Ø¸Øª Ø§Ø² Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§Û? Ø¬Ø¯Ù?Ø¯">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ø¹Ø¯Ù? ØÙ?Ø§Ø¸Øª Ø§Ø² Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§Û? Ø¬Ø¯Ù?Ø¯">
-<!ENTITY torbutton.prefs.priv_caption "ØªÙ?Ø¸Û?Ù?Ø§Øª ØØ±Û?Ù? Ø®ØµÙ?ØµÛ?">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ù?ØØ¯Ù?Ø¯â??Ù?Ø±Ø¯Ù? Ù?Ù?Ù?Ù?â??Ù?Ø§Ù? Ø·Ø±Ù? Ø³Ù?Ù? Ù? Ø¯Ø§Ø¯Ù?â??Ù?Ø§Ù? Ù¾Ù?Ú¯Ø±Ø¯Ù? Ø¯Ù?Ú¯Ø±">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ØªØºÙ?Ù?Ø±Ø¯Ø§Ø¯Ù? Ø¬Ø²Ø¦Ù?Ø§ØªÙ? Ù?Ù? Ø´Ù?Ø§Ø±Ø§ Ø§Ø² Ù?Ø§Ø±Ø¨Ø±Ø§Ù? Ø¯Ù?Ú¯Ø± ØªÙ?Ø± ØªÙ?Ù?Ø²Ù?Ù?â??Ù?Ù?Ø¯">
 <!ENTITY torbutton.prefs.sec_caption "Ø³Ø·Ø Ø§Ù?Ù?Û?Øª">
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index aa6d2b7..40475ae 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Uusi identiteetti">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Asetukset...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Lataa Tor Browser Bundle -pÃ¤ivitys...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "L">
 <!ENTITY torbutton.context_menu.cookieProtections "EvÃ¤steiden suojaukset">
diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/fil/torbutton.dtd
+++ b/src/chrome/locale/fil/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/fo/torbutton.dtd
+++ b/src/chrome/locale/fo/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 1b34290..184a9a6 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "ParamÃ¨tres du rÃ©seau Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "Valeurs par dÃ©faut">
 <!ENTITY torbutton.cookiedialog.title "GÃ©rer les protections de cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "ProtÃ©gÃ©">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres donnÃ©es de traÃ§age">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les dÃ©tails qui vous distinguent des autres utilisateurs du Navigateur Tor">
 <!ENTITY torbutton.prefs.sec_caption "Niveau de sÃ©curitÃ©">
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/fy/torbutton.dtd
+++ b/src/chrome/locale/fy/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index f9d0387..a01b1b0 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Nova identidade">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index cd91200..c228516 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "àªªà«?àª°àª¾àª¥àª®àª¿àª?àª¤àª¾àª?...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/gun/torbutton.dtd
+++ b/src/chrome/locale/gun/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ha/torbutton.dtd
+++ b/src/chrome/locale/ha/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 713efad..4b1edc4 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "×?×?×?×ª ×?×?×©×?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "×?×?×?×¨×?×ª">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "×?×?× ×?×ª ×§×?×§×?×?">
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 9076425..924a6e2 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "à¤ªà¥?à¤°à¤¿à¥?à¤°à¥?à¤¨à¥?à¤¸à¤¸ ...">
-<!ENTITY torbutton.context_menu.preferences.key "P/à¤ª">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A/à¤?">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index a878ecb..2cea64c 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Postavke...">
-<!ENTITY torbutton.context_menu.preferences.key "p">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "ZaÅ¡tite kolaÄ?iÄ?a">
diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ht/torbutton.dtd
+++ b/src/chrome/locale/ht/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 5cf204b..f0fa66e 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Ã?j szemÃ©lyazonossÃ¡g">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
-<!ENTITY torbutton.context_menu.preferences "BeÃ¡llÃtÃ¡sok...">
-<!ENTITY torbutton.context_menu.preferences.key "B">
 <!ENTITY torbutton.context_menu.networksettings "HÃ¡lÃ³zati beÃ¡llÃtÃ¡sok megnyitÃ¡sa">
-<!ENTITY torbutton.context_menu.networksettings.key "M">
 <!ENTITY torbutton.context_menu.downloadUpdate "Tor BÃ¶ngÃ©szÅ? csomag frissÃtÃ©sÃ©nek letÃ¶ltÃ©se">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "SÃ¼ti vÃ©delem">
diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/hy/torbutton.dtd
+++ b/src/chrome/locale/hy/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index c8a9cc2..73c4ed7 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Identitas Baru">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferensi...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index f5c88ae..629ea24 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "NÃ½tt auÃ°kenni">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 97df051..307f6a7 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Impostazioni di rete di Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "Reimposta i valori di default">
 <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protetto">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser">
 <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza">
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index ed84140..37c4c68 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Torã??ã??ã??ã?¯ã?¼ã?¯ã?®è¨å®?...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "ã??ã??ã?©ã?«ã??è¨å®?ã?«æ?»ã??">
 <!ENTITY torbutton.cookiedialog.title "Cookieä¿?è·ã??ç®¡ç??">
 <!ENTITY torbutton.cookiedialog.lockCol "ä¿?è·æ¸?ã?¿">
@@ -24,7 +20,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ä¿?è·ã??ã??ã?¦ã??ã??ã??ã?®ä»¥å¤?å??é?¤">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "æ?°ã??ã??Cookieã??ä¿?è·">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "æ?°ã??ã??Cookieã??ä¿?è·ã??ã?ªã??">
-<!ENTITY torbutton.prefs.priv_caption "ã??ã?©ã?¤ã??ã?·ã?¼è¨å®?">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ã?µã?¼ã??ã??ã?¼ã??ã?£ã?¼ã?®Cookieã??ã??ã?®ä»?ã?®ã??ã?©ã??ã?ã?³ã?°ã??ã?¼ã?¿ã??å?¶é??">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ã??ã?ªã??ã?¨ã?»ã??ã?®Torã??ã?©ã?¦ã?¶ã?®ã?¦ã?¼ã?¶ã?¼ã??å?ºå?¥ã??ã??è©³ç´°ã??å¤?æ?´">
 <!ENTITY torbutton.prefs.sec_caption "ã?»ã?ã?¥ã?ªã??ã?£ã?¬ã??ã?«">
diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/jv/torbutton.dtd
+++ b/src/chrome/locale/jv/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/kn/torbutton.dtd
+++ b/src/chrome/locale/kn/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 77e5f1f..61b4d53 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "í? ë¥´ ë?¤í?¸ì??í?¬ ì?¤ì ?...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "ì?¤ì ? ì´?ê¸°í??">
 <!ENTITY torbutton.cookiedialog.title "ì¿ í?¤ ë³´í?¸ ê´?ë¦¬">
 <!ENTITY torbutton.cookiedialog.lockCol "ë³´í?¸ë?¨">
@@ -24,7 +20,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ë³´í?¸ë?? ê²? ë¹¼ê³  ëª¨ë?? ì§?ì?°ê¸°">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ ë³´í?¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ë¥¼ ë³´í?¸í??ì§? ì??ì??">
-<!ENTITY torbutton.prefs.priv_caption "ê°?ì?¸ ì ?ë³´ ì?¤ì ?">
 <!ENTITY torbutton.prefs.restrict_thirdparty "ì ? 3ì?? ì¿ í?¤ì?? ë?¤ë¥¸ ì¶?ì ? ë?°ì?´í?° ì ?í??">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ë?¤ë¥¸ Tor browser ì?¬ì?©ì??ë¡?ë¶?í?° êµ¬ë³?ë??ë?? ì?¸ë¶? ì?¬í? ë³?ê²½">
 <!ENTITY torbutton.prefs.sec_caption "ë³´ì?? ë?±ê¸?">
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/kw/torbutton.dtd
+++ b/src/chrome/locale/kw/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd
index a77fab2..815e56d 100644
--- a/src/chrome/locale/ky/torbutton.dtd
+++ b/src/chrome/locale/ky/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Ð?Ð°Ò£Ñ? Ð¸Ð½Ñ?Ð°Ð½">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/lb/torbutton.dtd
+++ b/src/chrome/locale/lb/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd
index b3d1146..ee8c0d2 100644
--- a/src/chrome/locale/lg/torbutton.dtd
+++ b/src/chrome/locale/lg/torbutton.dtd
@@ -1,5 +1,3 @@
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ln/torbutton.dtd
+++ b/src/chrome/locale/ln/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/lo/torbutton.dtd
+++ b/src/chrome/locale/lo/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd
index 527eadb..247820d 100644
--- a/src/chrome/locale/lt/torbutton.dtd
+++ b/src/chrome/locale/lt/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Nauja tapatybÄ?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Nustatymai...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "SlapukÅ³ apsaugos">
diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd
index 1d4ea05..aed81db 100644
--- a/src/chrome/locale/lv/torbutton.dtd
+++ b/src/chrome/locale/lv/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Jauna identitÄ?te">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "AtvÄ?rt tÄ«kla iestatÄ«jumus...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "LejuplÄ?dÄ?t PÄ?rlÅ«ka Tor pakotnes jauninÄ?jumu...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "AizsardzÄ«ba no sÄ«kdatnÄ?m">
diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/mg/torbutton.dtd
+++ b/src/chrome/locale/mg/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/mi/torbutton.dtd
+++ b/src/chrome/locale/mi/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd
index 6d522d2..ba2b2cb 100644
--- a/src/chrome/locale/mk/torbutton.dtd
+++ b/src/chrome/locale/mk/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Ð?Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°...">
-<!ENTITY torbutton.context_menu.preferences.key "Z">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "Z">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ml/torbutton.dtd
+++ b/src/chrome/locale/ml/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/mn/torbutton.dtd
+++ b/src/chrome/locale/mn/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/mr/torbutton.dtd
+++ b/src/chrome/locale/mr/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ms/torbutton.dtd
+++ b/src/chrome/locale/ms/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd
index 18d2ef8..5bd7e2f 100644
--- a/src/chrome/locale/my/torbutton.dtd
+++ b/src/chrome/locale/my/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸ á?¡á??á??á?º">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "á?¦á?¸á??á?¬á?¸á??á?±á?¸á??á?»á??á?ºá??á?»á?¬á?¸...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "á??á?½á??á?ºá??á?®á?¸ á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸">
diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/nah/torbutton.dtd
+++ b/src/chrome/locale/nah/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/nap/torbutton.dtd
+++ b/src/chrome/locale/nap/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 4ded8d7..7e5150f 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Ny Identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Innstillinger...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Ã?pne nettverksinnstillinger...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Last ned Tor Browser Bundle oppdatering...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsel Beskyttelser">
diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ne/torbutton.dtd
+++ b/src/chrome/locale/ne/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index cc99538..710a24b 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Tor netwerk instellingen">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "Terugzetten op begintoestand">
 <!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen">
 <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers">
 <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau">
diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/nn/torbutton.dtd
+++ b/src/chrome/locale/nn/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/nso/torbutton.dtd
+++ b/src/chrome/locale/nso/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/oc/torbutton.dtd
+++ b/src/chrome/locale/oc/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/or/torbutton.dtd
+++ b/src/chrome/locale/or/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index a81a741..f198b7c 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "p">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/pap/torbutton.dtd
+++ b/src/chrome/locale/pap/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 6eacd3e..6a42d11 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Ustawienia Sieci Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "s">
 <!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.restore_defaults "Ustawienia domyÅ?lne">
 <!ENTITY torbutton.cookiedialog.title "ZarzÄ?dzaj ochronÄ? ciasteczek">
 <!ENTITY torbutton.cookiedialog.lockCol "Chronione">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane sÅ?uÅ¼Ä?ce do Å?ledzenia">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ZmieÅ? szczegÃ³Å?y odrÃ³Å¼niajÄ?ce CiÄ? od innych uÅ¼ytkownikÃ³w PrzeglÄ?darki Tora">
 <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeÅ?stwa">
diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/pms/torbutton.dtd
+++ b/src/chrome/locale/pms/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ps/torbutton.dtd
+++ b/src/chrome/locale/ps/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 0da50f9..d7de048 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Nova Identidade">
 <!ENTITY torbutton.context_menu.new_identity_key "Eu">
-<!ENTITY torbutton.context_menu.preferences "ConfiguraÃ§Ãµes...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Abrir ConfiguraÃ§Ãµes de Rede">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Baixar atualizaÃ§Ã£o do pacote Tor para navegadores...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "ProteÃ§Ãµes para Cookies">
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index d262db8..e0247b5 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "ConfiguraÃ§Ãµes da Rede Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "Restaurar PredefiniÃ§Ãµes">
 <!ENTITY torbutton.cookiedialog.title "Gerir ProteÃ§Ãµes dos Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que o diferencia dos outros utilizadores do Navegador Tor">
 <!ENTITY torbutton.prefs.sec_caption "NÃvel de SeguranÃ§a">
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 03bdb6e..a367d00 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Identitate noua">
 <!ENTITY torbutton.context_menu.new_identity_key "l">
-<!ENTITY torbutton.context_menu.preferences "PreferinÈ?e...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Protectii Cookie-uri.">
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index c2df4fc..d13ff00 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ñ?ÐµÑ?Ð¸ Tor">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "Ð?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ð¾Ð¹ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ð¾Ð²">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾">
@@ -24,7 +20,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð²Ñ?Ðµ, ÐºÑ?Ð¾Ð¼Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð½Ð½Ñ?Ñ?">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ?">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ?">
-<!ENTITY torbutton.prefs.priv_caption "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ ÐºÐ¾Ð½Ñ?Ð¸Ð´ÐµÐ½Ñ?Ð¸Ð°Ð»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð½Ð¸Ðµ ÐºÑ?ÐºÐ¸-Ñ?Ð°Ð¹Ð»Ñ? Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ð»ÐµÐ¶ÐµÐ½Ð¸Ñ?">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ?, Ð¾Ñ?Ð»Ð¸Ñ?Ð°Ñ?Ñ?Ð¸Ðµ Ð²Ð°Ñ? Ð¾Ñ? Ð´Ñ?Ñ?Ð³Ð¸Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¹ Tor Browser">
 <!ENTITY torbutton.prefs.sec_caption "Ð£Ñ?Ð¾Ð²ÐµÐ½Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/sco/torbutton.dtd
+++ b/src/chrome/locale/sco/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd
index ef9e28c..4478825 100644
--- a/src/chrome/locale/sk/torbutton.dtd
+++ b/src/chrome/locale/sk/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "NovÃ¡ identita">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index b0ce2ac..40828c9 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "nova indetiteta">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Nastavitve...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "piÅ¡kotkina zaÅ¡Ä?ita">
diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/so/torbutton.dtd
+++ b/src/chrome/locale/so/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/son/torbutton.dtd
+++ b/src/chrome/locale/son/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 7e3df0b..8daad7b 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Identitet i Ri">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd
index 71ee79f..200e911 100644
--- a/src/chrome/locale/sr/torbutton.dtd
+++ b/src/chrome/locale/sr/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Ð?Ð¾Ð² Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?ÐµÑ?">
 <!ENTITY torbutton.context_menu.new_identity_key "Ð?">
-<!ENTITY torbutton.context_menu.preferences "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ...">
-<!ENTITY torbutton.context_menu.preferences.key "Ð?">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Preuzmite Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð¾Ð·Ð²Ð¾Ð»Ðµ Ð·Ð° ÐºÐ¾Ð»Ð°Ñ?Ð¸Ñ?Ðµ">
diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/st/torbutton.dtd
+++ b/src/chrome/locale/st/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/su/torbutton.dtd
+++ b/src/chrome/locale/su/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index f8c0e67..e9d9a27 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Tor nÃ¤tverksinstÃ¤llningar...">
-<!ENTITY torbutton.context_menu.networksettings.key "Ã?">
 <!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.restore_defaults "Ã?terstÃ¤ll till standard">
 <!ENTITY torbutton.cookiedialog.title "Hantera skyddade kakor">
 <!ENTITY torbutton.cookiedialog.lockCol "Skyddad">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "BegrÃ¤nsa tredjepartskakor och annan tracking data">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ã?ndra detailjer som utmÃ¤rker dig ifrÃ¥n andra Tor Browser anvÃ¤ndare">
 <!ENTITY torbutton.prefs.sec_caption "SÃ¤kerhetsnivÃ¥">
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ta/torbutton.dtd
+++ b/src/chrome/locale/ta/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/te/torbutton.dtd
+++ b/src/chrome/locale/te/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/tg/torbutton.dtd
+++ b/src/chrome/locale/tg/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 3336433..70d1df2 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "à¸ªà¸£à¹?à¸²à¸?à¸?à¸±à¸§à¸?à¸?à¹?à¸«à¸¡à¹?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "A">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ti/torbutton.dtd
+++ b/src/chrome/locale/ti/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/tk/torbutton.dtd
+++ b/src/chrome/locale/tk/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index b67fd14..d6c87d1 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Tor AÄ? AyarlarÄ±...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "VarsayÄ±lanlarÄ± YÃ¼kle">
 <!ENTITY torbutton.cookiedialog.title "Ã?erez KorumasÄ± YÃ¶netimi">
 <!ENTITY torbutton.cookiedialog.lockCol "KorunmuÅ?">
@@ -24,7 +20,6 @@
 <!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.restrict_thirdparty "3. taraf Ã§erez ve diÄ?er iz sÃ¼rÃ¼cÃ¼ bilgiler engellensin">
 <!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.sec_caption "GÃ¼venlik DÃ¼zeyi">
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 7df0268..d551178 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Ð?Ð¾Ð²Ð° Ð¾Ñ?Ð¾Ð±Ð¸Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Ð?Ñ?Ð´ÐºÑ?Ð¸Ñ?Ð¸ Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð?ÐµÑ?ÐµÐ¶Ñ?...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Ð?Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ Ð¿Ð°ÐºÐµÑ? Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ñ? Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ?Ð° Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð°Ñ?Ð¸Ñ?Ñ? ÐºÑ?ÐºÐ¸">
diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ur/torbutton.dtd
+++ b/src/chrome/locale/ur/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/ve/torbutton.dtd
+++ b/src/chrome/locale/ve/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 4cfa289..25fbcec 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -2,16 +2,12 @@
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "VÃ²ng Tor má»?i cho trang nÃ y">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
-<!ENTITY torbutton.context_menu.preferences "CÃ i Ä?áº·t RiÃªng tÆ° vÃ  Báº£o máºt...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "CÃ i Ä?áº·t Máº¡ng Tor...">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Kiá»?m tra viá»?c cáºp nháºt trÃ¬nh duyá»?t Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Báº£o vá»? Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Nháº¥p Ä?á»? nháºn diá»?n Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "CÃ i Ä?áº·t RiÃªng tÆ° vÃ  Báº£o máºt">
 <!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,7 +20,6 @@
 <!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.restrict_thirdparty "Restrict third party cookies and other tracking data">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
 <!ENTITY torbutton.prefs.sec_caption "Má»©c Ä?á»? Báº£o máºt">
diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/wa/torbutton.dtd
+++ b/src/chrome/locale/wa/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/wo/torbutton.dtd
+++ b/src/chrome/locale/wo/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 347deeb..a73d4dd 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -2,16 +2,12 @@
 <!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.networksettings "Tor ç½?ç»?è®¾ç½®â?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!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.restore_defaults "æ?¢å¤?é»?è®¤è®¾ç½®">
 <!ENTITY torbutton.cookiedialog.title "ç®¡ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?æ?¤">
@@ -24,7 +20,6 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨ç§»é?¤ä»?ä¿?ç??å??ä¿?æ?¤ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?æ?¤æ?°ç?? Cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?æ?¤æ?°ç?? Cookie">
-<!ENTITY torbutton.prefs.priv_caption "é??ç§?è®¾ç½®">
 <!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?æ?°æ?®è·?è¸ªç¨?åº?">
 <!ENTITY torbutton.prefs.resist_fingerprinting "ä¿®æ?¹ Tor æµ?è§?å?¨ä¸å?¯å?ºå??ä½ ä¸?å?¶ä»? Tor ç?¨æ?·ç??ç»?è??ä¿¡æ?¯">
 <!ENTITY torbutton.prefs.sec_caption "å®?å?¨ç?çº§">
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index ebc2dda..0f98a7a 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "æ?´æ??èº«ä»½">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "è¨ç½®...(P)">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd
index 1aa3704..d8d88e4 100644
--- a/src/chrome/locale/zu/torbutton.dtd
+++ b/src/chrome/locale/zu/torbutton.dtd
@@ -1,9 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">

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

Prev by Author: [tor-commits] [tor-browser-bundle/maint-6.0] Bug 20342: Add tor-gencert.exe to expert bundle
Next by Author: [tor-commits] [tor-browser-bundle/master] Bug 13893: Make Tor Browser compatible with EMET
Previous by thread: [tor-commits] [torbutton/master] Bug 20244.3: Remove 'restrict third party cookies...' checkbox
Next by thread: [tor-commits] [torbutton/master] Bug 20244.2: Remove 'disable browser plugins' checkbox
Index(es):
- Author
- Thread