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

[gk]

commit ea0d6dc4ebc59c594162202e142549356075a981
Author: Arthur Edelstein <arthuredelst...@gmail.com>
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@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits