[tor-commits] [torbutton/master] Remove the Display Settings panel and associated locales

Mon Apr 22 23:30:44 UTC 2013

commit d78f8a5650e5e76e9f2ee0d584d04e4fe0ca1479
Author: Sukhbir Singh <sukhbir.in at gmail.com>
Date:   Thu Apr 4 00:47:18 2013 -0400

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

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index 97ffb7d..5a32c13 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -13,10 +13,6 @@ function torbutton_prefs_set_field_attributes(doc)
     var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
     var o_customprefs = torbutton_get_prefbranch('extensions.torbutton.custom.');
 
-    doc.getElementById('torbutton_panelStyle').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked);
-    doc.getElementById('torbutton_panelStyleText').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked);
-    doc.getElementById('torbutton_panelStyleIcon').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked);
-
     // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns
     if (doc.getElementById('torbutton_transparentTor').selected) {
         doc.getElementById('torbutton_settingsMethod').value = 'transparent';
@@ -151,13 +147,6 @@ function torbutton_prefs_init(doc) {
 
     var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
 
-    doc.getElementById('torbutton_displayStatusPanel').checked = o_torprefs.getBoolPref('display_panel');
-    var panel_style = doc.getElementById('torbutton_panelStyle');
-    var panel_style_pref = o_torprefs.getCharPref('panel_style');
-    if (panel_style_pref == 'text')
-        panel_style.selectedItem = doc.getElementById('torbutton_panelStyleText');
-    else if (panel_style_pref == 'iconic')
-        panel_style.selectedItem = doc.getElementById('torbutton_panelStyleIcon');
     // doc.getElementById('torbutton_panelStyle').value = o_torprefs.getCharPref('panel_style');
     var settings_method = doc.getElementById('torbutton_settingsMethod');
     var settings_method_pref = o_torprefs.getCharPref('settings_method');
@@ -217,8 +206,6 @@ function torbutton_prefs_save(doc) {
         }
     }
 
-    o_torprefs.setBoolPref('display_panel',   doc.getElementById('torbutton_displayStatusPanel').checked);
-    o_torprefs.setCharPref('panel_style',     doc.getElementById('torbutton_panelStyle').value);
     o_torprefs.setCharPref('settings_method', doc.getElementById('torbutton_settingsMethod').value);
     o_torprefs.setBoolPref('use_privoxy',     doc.getElementById('torbutton_usePrivoxy').checked);
     o_torprefs.setCharPref('http_proxy',      doc.getElementById('torbutton_httpProxy').value);
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index 76b9530..ee09b8b 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -20,7 +20,6 @@
      <tabs>
       <tab label="&torbutton.prefs.tor_settings;"/>
       <tab label="&torbutton.prefs.sec_settings;"/>
-      <tab label="&torbutton.prefs.display_settings;"/>
      </tabs>
      <tabpanels>
     <tabpanel>
@@ -155,19 +154,6 @@
               label="&torbutton.prefs.resist_fingerprinting;"/>
      </vbox>
     </tabpanel>
-    <tabpanel>
-       <vbox>
-        <label class="indent" control="torbutton_panelStyle" value="&torbutton.prefs.panel_format;"/>
-        <radiogroup class="indent" id="torbutton_panelStyle">
-            <radio value="text" id="torbutton_panelStyleText" label="&torbutton.prefs.panel_text_format;"/>
-
-            <radio value="iconic" id="torbutton_panelStyleIcon" label="&torbutton.prefs.panel_icon_format;"/>
-
-        </radiogroup>
-        <checkbox id="torbutton_displayStatusPanel" label="&torbutton.prefs.display_panel;" 
-                  oncommand="torbutton_prefs_set_field_attributes(document)"/>
-       </vbox>
-    </tabpanel>
 
 	</tabpanels>
    </tabbox>
diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ak/torbutton.dtd
+++ b/src/chrome/locale/ak/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/am/torbutton.dtd
+++ b/src/chrome/locale/am/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index e37a48f..91d5c83 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "ØªÙØ¶ÙŠÙ„Ø§Øª Ø²Ø± ØªÙˆØ±">
-<!ENTITY torbutton.prefs.display_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¹Ø±Ø¶">
-<!ENTITY torbutton.prefs.display_panel "Ø£Ø¸Ù‡Ø± ØØ§Ù„Ø© Ø§Ù„ÙˆØ³ÙŠØ· ÙÙŠ Ø´Ø±ÙŠØ· Ø§Ù„Ù…ØªØµÙØ">
-<!ENTITY torbutton.prefs.panel_format "ØµÙŠØºØ© Ø¹Ø±Ø¶ Ø§Ù„ØØ§Ù„Ø© ÙÙŠ Ø§Ù„Ø´Ø±ÙŠØ·:">
-<!ENTITY torbutton.prefs.panel_text_format "Ù†Øµ">
-<!ENTITY torbutton.prefs.panel_icon_format "Ø£ÙŠÙ‚ÙˆÙ†Ø©">
 <!ENTITY torbutton.prefs.tor_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„ÙˆØ³ÙŠØ·">
 <!ENTITY torbutton.prefs.recommended_settings "Ø§Ø³ØªØ®Ø¯Ù… Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„ÙˆØ³ÙŠØ· Ø§Ù„Ù…ØØ¨Ù‘Ø°Ø© Ù„Ù†Ø³Ø®ØªÙŠ Ù…Ù† ÙÙŠØ±ÙÙƒØ³">
 <!ENTITY torbutton.prefs.use_privoxy "Ø§Ø³ØªØ®Ø¯Ù… Privoxy">
diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/arn/torbutton.dtd
+++ b/src/chrome/locale/arn/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ast/torbutton.dtd
+++ b/src/chrome/locale/ast/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/az/torbutton.dtd
+++ b/src/chrome/locale/az/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/be/torbutton.dtd
+++ b/src/chrome/locale/be/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index 32d822a..fe6a4fd 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Tor Button á€¥á€®á€¸á€…á€¬á€¸á€±á€•á€¸á€Šá‚Šá€”á€¹á€»á€•á€á€ºá€€á€¹á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.display_settings "á€»á€•á€žá€›á€”á€¹ á€á€ºá€á€”á€¹á€Šá€á‚‡á€á€ºá€€á€¹á€™á€ºá€¬á€¸">
-<!ENTITY torbutton.prefs.display_panel "Tor proxy á€á€ºá€á€”á€¹á€Šá‚‡á€á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ Status Bar á€á€¼á€„á€¹ á€»á€•á€žá€›á€”á€¹">
-<!ENTITY torbutton.prefs.panel_format "Status bar á€»á€•á€žá€™á‚ˆ á€•á€¶á€¯á€…á€¶">
-<!ENTITY torbutton.prefs.panel_text_format "á€…á€¬á€žá€¬á€¸">
-<!ENTITY torbutton.prefs.panel_icon_format "á€¡á€á€¯á€„á€¹á€€á€¼á€”á€¹ á€›á€¯á€•á€¹á€•á€¶á€¯">
 <!ENTITY torbutton.prefs.tor_settings "Proxy á€á€ºá€á€”á€¹á€Šá‚‡á€á€á€ºá€€á€¹á€™á€ºá€¬á€¸">
 <!ENTITY torbutton.prefs.recommended_settings "á€¡á¾á€€á€¶á€»á€•á€³ á€±á€‘á€¬á€€á€¹á€á€¶á€±á€žá€¬ proxy á€á€ºá€á€”á€¹á€Šá€á‚‡á€á€ºá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ á€™á€á€™á€á Firefox version á€á€¼á€„á€¹ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€›á€”á€¹">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy á€€á€á€¯ á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€›á€”á€¹">
diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/bn-IN/torbutton.dtd
+++ b/src/chrome/locale/bn-IN/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/bn/torbutton.dtd
+++ b/src/chrome/locale/bn/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/br/torbutton.dtd
+++ b/src/chrome/locale/br/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/bs/torbutton.dtd
+++ b/src/chrome/locale/bs/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index df2d74a..2d43949 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "PreferÃ¨ncies de Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Mostra la configuraciÃ³">
-<!ENTITY torbutton.prefs.display_panel "Mostra la configuraciÃ³ proxy a la barra d'estat">
-<!ENTITY torbutton.prefs.panel_format "Format de la barra d'estat:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icona">
 <!ENTITY torbutton.prefs.tor_settings "ConfiguraciÃ³ del proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Utilitza la configuraciÃ³ recomanada de proxy per a la meva versiÃ³ de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Utilitza Privoxy">
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 1e0990f..5f15f81 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "NastavenÃ Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Zobrazit nastavenÃ">
-<!ENTITY torbutton.prefs.display_panel "Zobrazit nastavenÃ proxy serveru ve stavovÃ©m Å™Ã¡dku">
-<!ENTITY torbutton.prefs.panel_format "FormÃ¡t zobrazenÃ status baru">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikona">
 <!ENTITY torbutton.prefs.tor_settings "NastavenÃ Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "PouÅ¾Ãt doporuÄenÃ¡ nastavenÃ proxy pro mou verzi Firefoxu">
 <!ENTITY torbutton.prefs.use_privoxy "PouÅ¾itÃ Proxy">
diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/csb/torbutton.dtd
+++ b/src/chrome/locale/csb/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/cy/torbutton.dtd
+++ b/src/chrome/locale/cy/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index b21e03b..49f183a 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton-indstillinger">
-<!ENTITY torbutton.prefs.display_settings "Visningsindstillinger">
-<!ENTITY torbutton.prefs.display_panel "Vis Tor proxy-indstilling i statuslinjen">
-<!ENTITY torbutton.prefs.panel_format "Vis i Statusbar som:">
-<!ENTITY torbutton.prefs.panel_text_format "Tekst">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy-indstillinger">
 <!ENTITY torbutton.prefs.recommended_settings "Brug de anbefalede proxyindstillinger til min version af Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Brug Privoxy">
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index f6d7e44..92c2fc7 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Einstellungen fÃ¼r Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Anzeige-Einstellungen">
-<!ENTITY torbutton.prefs.display_panel "Zeige Einstellung fÃ¼r den Tor-Proxy in der Statusleiste an">
-<!ENTITY torbutton.prefs.panel_format "Anzeigeformat der Statusleiste">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Symbol">
 <!ENTITY torbutton.prefs.tor_settings "Proxy-Einstellungen">
 <!ENTITY torbutton.prefs.recommended_settings "Benutze die empfohlenen Proxy-Einstellungen fÃ¼r meine Firefox-Version">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy verwenden">
diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/dz/torbutton.dtd
+++ b/src/chrome/locale/dz/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 77c0b5d..401d4cd 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚">
-<!ENTITY torbutton.prefs.display_panel "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Î·Ï‚ ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚ Ï„Î¿Ï… Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î® Tor ÏƒÏ„Î·Î½ Î³ÏÎ±Î¼Î¼Î® ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚">
-<!ENTITY torbutton.prefs.panel_format "Î ÏÎ¿Î²Î¿Î»Î® ÏƒÏ„Î· Î³ÏÎ±Î¼Î¼Î® ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î¼Îµ :">
-<!ENTITY torbutton.prefs.panel_text_format "ÎšÎµÎ¯Î¼ÎµÎ½Î¿">
-<!ENTITY torbutton.prefs.panel_icon_format "Î•Î¹ÎºÎ¿Î½Î¯Î´Î¹Î¿">
 <!ENTITY torbutton.prefs.tor_settings "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®">
 <!ENTITY torbutton.prefs.recommended_settings "Î§ÏÎ®ÏƒÎ· Ï„Ï‰Î½ Ï€ÏÎ¿Ï„ÎµÎ¹Î½ÏŒÎ¼ÎµÎ½Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Î³Î¹Î± Ï„Î·Î½ Ï„ÏÎÏ‡Î¿Ï…ÏƒÎ± ÎÎºÎ´Î¿ÏƒÎ· Ï„Î¿Ï… Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Î§ÏÎ®ÏƒÎ· Ï„Î¿Ï… Privoxy">
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd
index ad5b7a8..5da8347 100644
--- a/src/chrome/locale/eo/torbutton.dtd
+++ b/src/chrome/locale/eo/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Agordoj de Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Fasadâ€agordoj">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Retperantâ€agordoj">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Uzi Privoxyâ€™on">
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 2273430..38d54e6 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Preferencias de Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Mostrar configuraciÃ³n">
-<!ENTITY torbutton.prefs.display_panel 'Mostrar la configuraciÃ³n de "proxy" Tor en la barra de estado'>
-<!ENTITY torbutton.prefs.panel_format "Formato a mostrar en la barra de estado:">
-<!ENTITY torbutton.prefs.panel_text_format "Texto">
-<!ENTITY torbutton.prefs.panel_icon_format "Icono">
 <!ENTITY torbutton.prefs.tor_settings "ConfiguraciÃ³n para proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar la configuraciÃ³n para proxy recomendada para mi versiÃ³n de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Usar Privoxy">
diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd
index 70c2d22..6a4b8e4 100644
--- a/src/chrome/locale/et/torbutton.dtd
+++ b/src/chrome/locale/et/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbuttoni eelistused">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 130ea88..8141046 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Hobespenak">
-<!ENTITY torbutton.prefs.display_settings "Erakutsi Ezarpenak">
-<!ENTITY torbutton.prefs.display_panel "Erakutsi Tor proxy ezarpenak egoera barran">
-<!ENTITY torbutton.prefs.panel_format "Egoera barran agertzeko formatua:">
-<!ENTITY torbutton.prefs.panel_text_format "Testua">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikonoa">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Ezarpenak">
 <!ENTITY torbutton.prefs.recommended_settings "Erabili nire Firefox bertsiorako proxy ezarpen gomendatuak">
 <!ENTITY torbutton.prefs.use_privoxy "Erabili Privoxy">
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 538d8e4..f532573 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ø¯Ú©Ù…Ù‡ ØªÙØ±">
-<!ENTITY torbutton.prefs.display_settings "ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ù†Ù…Ø§ÙŠØ´">
-<!ENTITY torbutton.prefs.display_panel "Ù†Ù…Ø§ÙŠØ´ ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ù¾Ø±Ø§Ú©Ø³ÛŒ ØªÙØ± Ø¯Ø± Ù†ÙˆØ§Ø± ÙˆØ¶Ø¹ÙŠØª">
-<!ENTITY torbutton.prefs.panel_format "Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù†Ù…Ø§ÙŠØ´ Ù†ÙˆØ§Ø± ÙˆØ¶Ø¹ÙŠØª:">
-<!ENTITY torbutton.prefs.panel_text_format "Ù…ØªÙ†">
-<!ENTITY torbutton.prefs.panel_icon_format "Ø´Ù…Ø§ÙŠÙ„">
 <!ENTITY torbutton.prefs.tor_settings "ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ù¾Ø±Ø§Ú©Ø³ÛŒ">
 <!ENTITY torbutton.prefs.recommended_settings "Ø¨Ú©Ø§Ø±Ø¨Ø±Ø¯Ù† ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ù¾Ø±Ø§Ú©Ø³ÛŒ ØªÙˆØµÙŠÙ‡ Ø´Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ù†Ø³Ø®Ù‡ ÙØ§ÙŠØ±ÙØ§Ú©Ø³ Ù…Ù†">
 <!ENTITY torbutton.prefs.use_privoxy "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù¾Ø±Ø§ÙŠÙˆØ§Ú©Ø³ÛŒ (Privoxy)">
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index 7d46c6d..73b0c20 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Asetukset">
-<!ENTITY torbutton.prefs.display_settings "Ulkoasu">
-<!ENTITY torbutton.prefs.display_panel "NÃ¤ytÃ¤ Tor-vÃ¤lityspalvelimen asetukset tilarivillÃ¤">
-<!ENTITY torbutton.prefs.panel_format "Tilapalkin ulkoasu:">
-<!ENTITY torbutton.prefs.panel_text_format "Teksti">
-<!ENTITY torbutton.prefs.panel_icon_format "Kuvake">
 <!ENTITY torbutton.prefs.tor_settings "VÃ¤lityspalvelin Asetukset">
 <!ENTITY torbutton.prefs.recommended_settings "KÃ¤ytÃ¤ suositeltuja vÃ¤lityspalvelin asetuksia minun Firefox versiolleni.">
 <!ENTITY torbutton.prefs.use_privoxy "KÃ¤ytÃ¤ PrivoxyÃ¤">
diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/fil/torbutton.dtd
+++ b/src/chrome/locale/fil/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/fo/torbutton.dtd
+++ b/src/chrome/locale/fo/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 1d39aaa..2cb23cc 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "PrÃ©fÃ©rences Torbutton">
-<!ENTITY torbutton.prefs.display_settings "ParamÃ¨tres d'affichage">
-<!ENTITY torbutton.prefs.display_panel "Afficher les paramÃ¨tres du proxy Tor dans la barre d'Ã©tat">
-<!ENTITY torbutton.prefs.panel_format "Format d'affichage de la barre d'Ã©tat :">
-<!ENTITY torbutton.prefs.panel_text_format "Texte">
-<!ENTITY torbutton.prefs.panel_icon_format "IcÃ´ne">
 <!ENTITY torbutton.prefs.tor_settings "ParamÃ¨tres du proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramÃ¨tres de proxy recommandÃ©s pour ma version de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Utiliser Privoxy">
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/fy/torbutton.dtd
+++ b/src/chrome/locale/fy/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index 2d9339b..c88596c 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "àªŸà«‹àª°àª¬àªŸàª¨ àªªà«àª°àª¾àª¥àª®àª¿àª•àª¤àª¾àª“">
-<!ENTITY torbutton.prefs.display_settings "àª¦à«‡àª–àª¾àªµ àª—à«‹àª àªµàª£à«€àª“">
-<!ENTITY torbutton.prefs.display_panel "àª¸à«àª¥àª¿àª¤àª¿àªªàªŸà«àªŸà«€àª®àª¾àª‚ àªŸà«‹àª° àªªà«àª°à«‹àª•à«àª¸à«€ àª—à«‹àª àªµàª£à«€àª“ àª¦àª°à«àª¶àª¾àªµà«‹">
-<!ENTITY torbutton.prefs.panel_format "àª¸à«àª¥àª¿àª¤àª¿àªªàªŸà«àªŸà«€ àª¦à«‡àª–àª¾àªµ àª¬àª‚àª§àª¾àª°àª£:">
-<!ENTITY torbutton.prefs.panel_text_format "àª²àª–àª¾àª£">
-<!ENTITY torbutton.prefs.panel_icon_format "àªšàª¿àª¹à«àª¨">
 <!ENTITY torbutton.prefs.tor_settings "àªªà«àª°à«‹àª•à«àª¸à«€ àª—à«‹àª àªµàª£à«€àª“">
 <!ENTITY torbutton.prefs.recommended_settings "àª®àª¾àª°à«€ àª«àª¾àª¯àª°àª«à«‹àª•à«àª¸ àª†àªµà«ƒàª¤à«àª¤àª¿ àª®àª¾àªŸà«‡ àª¸à«‚àªšàªµà«‡àª² àªªà«àª°à«‹àª•à«àª¸à«€ àª—à«‹àª àªµàª£à«€àª“ àªµàª¾àªªàª°à«‹">
 <!ENTITY torbutton.prefs.use_privoxy "àªªà«àª°à«‹àª•à«àª¸à«€ àªµàª¾àªªàª°à«‹">
diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/gun/torbutton.dtd
+++ b/src/chrome/locale/gun/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ha/torbutton.dtd
+++ b/src/chrome/locale/ha/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index ead751a..27d9eb4 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "×”×’×“×¨×•×ª Torbutton">
-<!ENTITY torbutton.prefs.display_settings "×”×¦×’ ×”×’×“×¨×•×ª">
-<!ENTITY torbutton.prefs.display_panel "×”×¦×’  ×”×’×“×¨×•×ª Tor proxy ">
-<!ENTITY torbutton.prefs.panel_format "×¤×•×¨×ž×˜ ×©×•×¨×ª ×”×ž×¦×‘:">
-<!ENTITY torbutton.prefs.panel_text_format "×˜×§×¡×˜">
-<!ENTITY torbutton.prefs.panel_icon_format "××™×™×§×•×Ÿ">
 <!ENTITY torbutton.prefs.tor_settings "×”×’×“×¨×•×ª ×¤×¨×•×§×¡×™">
 <!ENTITY torbutton.prefs.recommended_settings '×”×©×ª×ž×© ×‘×”×’×“×¨×•×ª ×¤×¨×•×§×¡×™ ×ž×•×ž×œ×¦×•×ª ×¢×‘×•×¨ ×’×¨×¡×ª ×”"×¤×™×™×¨×¤×•×§×¡" ×©×œ×™'>
 <!ENTITY torbutton.prefs.use_privoxy "×”×©×ª×ž×© ×‘×¤×¨×™×‘×•×§×¡×™">
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index ae2a84f..f86dd37 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "à¤Ÿà¥‹à¤° à¤¬à¤Ÿà¤¨ à¤ªà¥à¤°à¤¿à¥žà¥à¤°à¤¨à¥à¤¸à¥‡à¤¸">
-<!ENTITY torbutton.prefs.display_settings "à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤ªà¤Ÿà¤²">
-<!ENTITY torbutton.prefs.display_panel "à¤Ÿà¥‹à¤° à¤•à¥‡ à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤— à¤•à¥‹ à¤…à¤µà¤¸à¥à¤¥à¤¿à¤¤à¤¿ à¤¬à¤¾à¤° à¤®à¥‡ à¤¦à¤°à¥à¤¶à¤¾à¤¯à¥‡">
-<!ENTITY torbutton.prefs.panel_format "à¤…à¤µà¤¸à¥à¤¥à¤¿à¤¤à¤¿ à¤¬à¤¾à¤° à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤«à¥‰à¤°à¥à¤®à¥‡à¤Ÿ">
-<!ENTITY torbutton.prefs.panel_text_format "à¤ªà¤¾à¤ à¥à¤¯à¤¾à¤‚à¤¶">
-<!ENTITY torbutton.prefs.panel_icon_format "à¤ªà¥à¤°à¤¤à¤¿à¤®à¥‚à¤°à¥à¤¤à¤¿/à¤†à¤ˆà¤•à¥à¤¨">
 <!ENTITY torbutton.prefs.tor_settings "à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ à¤¸à¥‡à¤Ÿà¥€à¤‚à¤—">
 <!ENTITY torbutton.prefs.recommended_settings "à¤®à¥‡à¤°à¥‡ à¥žà¤¾à¤¯à¤° à¥žà¤¾à¤•à¥à¤¸ à¤•à¤¥à¤¨ à¤•à¥‡ à¤²à¤¿à¤¯à¥‡ à¤¸à¥à¤à¤¾à¤¯à¥€ à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤— à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¥‡ ">
 <!ENTITY torbutton.prefs.use_privoxy "à¤ªà¥à¤°à¤¿à¤µà¥‹à¤•à¥à¤¸à¥€ à¤•à¤¾ à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¥‡">
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 3a1f4e7..4c286c5 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton postavke">
-<!ENTITY torbutton.prefs.display_settings "PrikaÅ¾i postavke">
-<!ENTITY torbutton.prefs.display_panel "PrikaÅ¾i Tor proxy postavke u statusnoj traci">
-<!ENTITY torbutton.prefs.panel_format "Oblik prikazivanja u statusnoj traci:">
-<!ENTITY torbutton.prefs.panel_text_format "Tekst">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikona">
 <!ENTITY torbutton.prefs.tor_settings "Proxy postavke">
 <!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄene proxy postavke za moju inaÄicu Firefoxa">
 <!ENTITY torbutton.prefs.use_privoxy "Koristi Privoxy">
diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ht/torbutton.dtd
+++ b/src/chrome/locale/ht/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 2db4c2c..9b6c85b 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton beÃ¡llÃtÃ¡sok">
-<!ENTITY torbutton.prefs.display_settings "MegjelenÃtÃ©si beÃ¡llÃtÃ¡sok">
-<!ENTITY torbutton.prefs.display_panel "A Tor proxy beÃ¡llÃtÃ¡sok megjelenÃtÃ©se az Ã¡llapot soron">
-<!ENTITY torbutton.prefs.panel_format "Ãllapot sor megjelenÃ©si formÃ¡tum:">
-<!ENTITY torbutton.prefs.panel_text_format "SzÃ¶veg">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy beÃ¡llÃtÃ¡sok">
 <!ENTITY torbutton.prefs.recommended_settings "Az ajÃ¡nlott proxy beÃ¡llÃtÃ¡sok hasznÃ¡lata a Firefox verziÃ³mhoz">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy hasznÃ¡lata">
diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/hy/torbutton.dtd
+++ b/src/chrome/locale/hy/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index aa77061..bd81b27 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Preferensi Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Pengaturan Tampilan">
-<!ENTITY torbutton.prefs.display_panel "Tampilkan pengaturan proxy Tor pada status bar">
-<!ENTITY torbutton.prefs.panel_format "Susunan tampilan status bar">
-<!ENTITY torbutton.prefs.panel_text_format "Teks">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikon">
 <!ENTITY torbutton.prefs.tor_settings "Pengaturan proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Gunakan pengaturan proxy yang disarankan untuk versi Firefox saya">
 <!ENTITY torbutton.prefs.use_privoxy "Gunakan Privoxy">
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index c429c93..7a37602 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Preferenze di Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Impostazioni di visualizzazione">
-<!ENTITY torbutton.prefs.display_panel "Mostra le impostazioni del proxy Tor nella barra di stato">
-<!ENTITY torbutton.prefs.panel_format "Formato di visualizzazione della barra di stato:">
-<!ENTITY torbutton.prefs.panel_text_format "Testo">
-<!ENTITY torbutton.prefs.panel_icon_format "Icona">
 <!ENTITY torbutton.prefs.tor_settings "Configurazione del proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usa le impostazioni proxy consigliate per questa versione di Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Usa Privoxy">
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index dd69d58..e8c2b01 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbuttonè¨å®š">
-<!ENTITY torbutton.prefs.display_settings "è¡¨ç¤ºè¨å®š">
-<!ENTITY torbutton.prefs.display_panel "Torãƒ—ãƒã‚¯ã‚·è¨å®šã‚’ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ã«è¡¨ç¤ºã™ã‚‹">
-<!ENTITY torbutton.prefs.panel_format "ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ã®è¡¨ç¤ºæ–¹æ³•: ">
-<!ENTITY torbutton.prefs.panel_text_format "ãƒ†ã‚ã‚¹ãƒˆ">
-<!ENTITY torbutton.prefs.panel_icon_format "ã‚¢ã‚¤ã‚³ãƒ³">
 <!ENTITY torbutton.prefs.tor_settings "ãƒ—ãƒã‚¯ã‚·è¨å®š">
 <!ENTITY torbutton.prefs.recommended_settings "Firefoxã®ãƒ—ãƒã‚¯ã‚·è¨å®šã‚’ä½¿ã†">
 <!ENTITY torbutton.prefs.use_privoxy "ãƒ—ãƒã‚¯ã‚·ã‚’ä½¿ã†">
diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/jv/torbutton.dtd
+++ b/src/chrome/locale/jv/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/kn/torbutton.dtd
+++ b/src/chrome/locale/kn/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 492d059..91fb87c 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton í™˜ê²½ ì„¤ì •">
-<!ENTITY torbutton.prefs.display_settings "í™”ë©´ ì„¤ì •">
-<!ENTITY torbutton.prefs.display_panel "ìƒíƒœë°”ì— Tor í”„ë¡ì‹œ ì„¤ì •ì„ í‘œì‹œ">
-<!ENTITY torbutton.prefs.panel_format "ìƒíƒœ ë°” í‘œì‹œ í˜•íƒœ : ">
-<!ENTITY torbutton.prefs.panel_text_format "í…ìŠ¤íŠ¸">
-<!ENTITY torbutton.prefs.panel_icon_format "ì•„ì´ì½˜">
 <!ENTITY torbutton.prefs.tor_settings "í”„ë¡ì‹œ ì„¤ì •">
 <!ENTITY torbutton.prefs.recommended_settings "ë‚´ê°€ ì‚¬ìš©í•˜ê³  ìžˆëŠ” íŒŒì´ì–´íìŠ¤ë¥¼ ìœ„í•œ ì¶”ì²œ ì„¤ì • ì‚¬ìš©">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy ì‚¬ìš©">
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/kw/torbutton.dtd
+++ b/src/chrome/locale/kw/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ky/torbutton.dtd
+++ b/src/chrome/locale/ky/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/lb/torbutton.dtd
+++ b/src/chrome/locale/lb/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd
index 998eb76..056cc52 100644
--- a/src/chrome/locale/lg/torbutton.dtd
+++ b/src/chrome/locale/lg/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ln/torbutton.dtd
+++ b/src/chrome/locale/ln/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/lo/torbutton.dtd
+++ b/src/chrome/locale/lo/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/lt/torbutton.dtd
+++ b/src/chrome/locale/lt/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd
index b644479..f3b6c9c 100644
--- a/src/chrome/locale/lv/torbutton.dtd
+++ b/src/chrome/locale/lv/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton preferences">
-<!ENTITY torbutton.prefs.display_settings "RÄdÄ«t iestatÄ«jumus">
-<!ENTITY torbutton.prefs.display_panel "RÄdÄ«t Tor'a starpnieka iestatÄ«jumus statusa joslÄ">
-<!ENTITY torbutton.prefs.panel_format "Statusa joslas rÄdÄ«Å¡anas formÄts:">
-<!ENTITY torbutton.prefs.panel_text_format "Teksts">
-<!ENTITY torbutton.prefs.panel_icon_format "Piktogramma">
 <!ENTITY torbutton.prefs.tor_settings "Starpnieka iestatÄ«jumi">
 <!ENTITY torbutton.prefs.recommended_settings "Lietot manai Firefox'a versijai ieteiktos starpnieka iestatÄ«jumus">
 <!ENTITY torbutton.prefs.use_privoxy "Lietot Privoxy">
diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/mg/torbutton.dtd
+++ b/src/chrome/locale/mg/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/mi/torbutton.dtd
+++ b/src/chrome/locale/mi/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/mk/torbutton.dtd
+++ b/src/chrome/locale/mk/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ml/torbutton.dtd
+++ b/src/chrome/locale/ml/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/mn/torbutton.dtd
+++ b/src/chrome/locale/mn/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/mr/torbutton.dtd
+++ b/src/chrome/locale/mr/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ms/torbutton.dtd
+++ b/src/chrome/locale/ms/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd
index be1920c..56bdee8 100644
--- a/src/chrome/locale/my/torbutton.dtd
+++ b/src/chrome/locale/my/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton á€¦á€¸á€…á€¬á€¸á€•á€±á€¸á€á€»á€€á€ºá€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.display_settings "á€•á€¼á€žá€™á€¾á€¯ á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸">
-<!ENTITY torbutton.prefs.display_panel "Tor proxy á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ status bar á€‘á€²á€á€½á€„á€º á€•á€¼á€žá€›á€”á€º">
-<!ENTITY torbutton.prefs.panel_format "Status bar áŒ á€–á€±á€«á€ºá€•á€¼á€™á€Šá€ºá€· á€•á€¯á€¶á€…á€¶ -">
-<!ENTITY torbutton.prefs.panel_text_format "á€…á€¬á€žá€¬á€¸">
-<!ENTITY torbutton.prefs.panel_icon_format "á€¡á€á€¯á€„á€ºá€€á€½á€”á€º">
 <!ENTITY torbutton.prefs.tor_settings "á€•á€›á€±á€¬á€€á€ºá€‡á€® á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸">
 <!ENTITY torbutton.prefs.recommended_settings "á€€á€»á€½á€”á€ºá€á€±á€¬á€ºá€· á€™á€®á€¸á€œá€»á€¾á€¶á€™á€¼á€±á€á€½á€±á€¸ á€—á€¬á€¸á€›á€¾á€„á€ºá€¸á€¡á€á€½á€€á€º á€¡á€€á€¼á€¶á€•á€¼á€¯á€‘á€¬á€¸á€žá€±á€¬ á€•á€›á€±á€¬á€€á€ºá€‡á€® á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸á€€á€á€¯ á€¡á€žá€¯á€¶á€¸á€•á€¼á€¯á€›á€”á€º">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy á€€á€á€¯ á€žá€¯á€¶á€¸á€›á€”á€º">
diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/nah/torbutton.dtd
+++ b/src/chrome/locale/nah/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/nap/torbutton.dtd
+++ b/src/chrome/locale/nap/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 2343ad1..f6fa83e 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Innstillinger for Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Innstillinger for visning">
-<!ENTITY torbutton.prefs.display_panel "Vis proxyinnstillinger for Tor i statuslinjen">
-<!ENTITY torbutton.prefs.panel_format "Visningsformat for statuslinjen:">
-<!ENTITY torbutton.prefs.panel_text_format "Tekst">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikon">
 <!ENTITY torbutton.prefs.tor_settings "Proxyinnstillinger">
 <!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte proxyinnstillinger for min versjon av Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Bruk Privoxy">
diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ne/torbutton.dtd
+++ b/src/chrome/locale/ne/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 266e05e..279ffdc 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton voorkeuren">
-<!ENTITY torbutton.prefs.display_settings "Weergave-instellingen">
-<!ENTITY torbutton.prefs.display_panel "Tor proxy-instelling weergeven in de statusbalk">
-<!ENTITY torbutton.prefs.panel_format "Weergave in statusbalk:">
-<!ENTITY torbutton.prefs.panel_text_format "Tekst">
-<!ENTITY torbutton.prefs.panel_icon_format "Pictogram">
 <!ENTITY torbutton.prefs.tor_settings "Proxy-instellingen">
 <!ENTITY torbutton.prefs.recommended_settings "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy gebruiken">
diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/nn/torbutton.dtd
+++ b/src/chrome/locale/nn/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/nso/torbutton.dtd
+++ b/src/chrome/locale/nso/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/oc/torbutton.dtd
+++ b/src/chrome/locale/oc/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/or/torbutton.dtd
+++ b/src/chrome/locale/or/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/pap/torbutton.dtd
+++ b/src/chrome/locale/pap/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index ff7237e..a4e76d6 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton - ustawienia">
-<!ENTITY torbutton.prefs.display_settings "Ustawienia wyÅ›wietlania">
-<!ENTITY torbutton.prefs.display_panel "WyÅ›wietlaj stan proxy Tor na pasku stanu">
-<!ENTITY torbutton.prefs.panel_format "Format wyÅ›wietlania na pasku stanu:">
-<!ENTITY torbutton.prefs.panel_text_format "Tekst">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikona">
 <!ENTITY torbutton.prefs.tor_settings "Ustawienia proxy">
 <!ENTITY torbutton.prefs.recommended_settings "UÅ¼yj zalecanych ustawieÅ„ proxy dla tej wersji Firefoksa">
 <!ENTITY torbutton.prefs.use_privoxy "UÅ¼yj Privoxy">
diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/pms/torbutton.dtd
+++ b/src/chrome/locale/pms/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ps/torbutton.dtd
+++ b/src/chrome/locale/ps/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 4d37967..f5dc7ca 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "ConfiguraÃ§Ãµes do BotÃ£o do Tor">
-<!ENTITY torbutton.prefs.display_settings "Exibir ConfiguraÃ§Ãµes">
-<!ENTITY torbutton.prefs.display_panel "Exibir as configuraÃ§Ãµes de proxy do Tor na barra de status">
-<!ENTITY torbutton.prefs.panel_format "Formato de exibiÃ§Ã£o da barra de status:">
-<!ENTITY torbutton.prefs.panel_text_format "Texto">
-<!ENTITY torbutton.prefs.panel_icon_format "Ãcone">
 <!ENTITY torbutton.prefs.tor_settings "ConfiguraÃ§Ãµes de Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar as configuraÃ§Ãµes de proxy recomendadas para a minha versÃ£o de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Usar o Privoxy">
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index dfafc74..4692fb9 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "PreferÃªncias Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Mostrar configuraÃ§Ãµes">
-<!ENTITY torbutton.prefs.display_panel "Mostrar configuraÃ§Ãµes do proxy Tor na barra de estado">
-<!ENTITY torbutton.prefs.panel_format "Formato de visualizaÃ§Ã£o na barra de estado:">
-<!ENTITY torbutton.prefs.panel_text_format "Texto">
-<!ENTITY torbutton.prefs.panel_icon_format "Ãcone">
 <!ENTITY torbutton.prefs.tor_settings "ConfiguraÃ§Ãµes do Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Utilizar as configuraÃ§Ãµes recomendadas do proxy para minha versÃ£o do Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy">
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 0d9f76c..4ec38cb 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "PreferinÈ›e Torbutton">
-<!ENTITY torbutton.prefs.display_settings "SetÄƒri de vizualizare">
-<!ENTITY torbutton.prefs.display_panel "AratÄƒ setÄƒrile proxy pentru Tor Ã®n bara de statut">
-<!ENTITY torbutton.prefs.panel_format "Bara de stare,formatul de afiÅŸare:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "IconiÈ›Äƒ">
 <!ENTITY torbutton.prefs.tor_settings "SetÄƒrile pentru proxy">
 <!ENTITY torbutton.prefs.recommended_settings "FoloseÈ™te setÄƒrile pentru proxy recomandate pentru versiunea mea de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "FoloseÈ™te Privoxy">
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index db9356f..e8cc357 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Torbutton">
-<!ENTITY torbutton.prefs.display_settings "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
-<!ENTITY torbutton.prefs.display_panel "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Tor-Ð¿Ñ€Ð¾ÐºÑÐ¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ñ">
-<!ENTITY torbutton.prefs.panel_format "Ð¡Ñ‚Ñ€Ð¾ÐºÐ° ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ:">
-<!ENTITY torbutton.prefs.panel_text_format "Ð¢ÐµÐºÑÑ‚">
-<!ENTITY torbutton.prefs.panel_icon_format "Ð—Ð½Ð°Ñ‡Ð¾Ðº">
 <!ENTITY torbutton.prefs.tor_settings "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ñ€Ð¾ÐºÑÐ¸">
 <!ENTITY torbutton.prefs.recommended_settings "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¿Ñ€Ð¾ÐºÑÐ¸, Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð²ÐµÑ€ÑÐ¸Ð¸ Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Privoxy">
diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/sco/torbutton.dtd
+++ b/src/chrome/locale/sco/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/sk/torbutton.dtd
+++ b/src/chrome/locale/sk/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 2a3f82f..38e0cb8 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton nastavitve">
-<!ENTITY torbutton.prefs.display_settings "Nastavitve prikaza">
-<!ENTITY torbutton.prefs.display_panel "PrikaÅ¾i nastavitev anonimizacije v statusni vrstici">
-<!ENTITY torbutton.prefs.panel_format "NaÄin prikaza v statusni vrstici:">
-<!ENTITY torbutton.prefs.panel_text_format "besedilo">
-<!ENTITY torbutton.prefs.panel_icon_format "ikona">
 <!ENTITY torbutton.prefs.tor_settings "Nastavitve posredniÅ¡kega (proxy) streÅ¾nika">
 <!ENTITY torbutton.prefs.recommended_settings "Uporabi priporoÄene nastavitve posredniÅ¡kega streÅ¾nika za mojo razliÄico Firefoxa">
 <!ENTITY torbutton.prefs.use_privoxy "Uporabi tudi povezavo preko Privoxy-a">
diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/so/torbutton.dtd
+++ b/src/chrome/locale/so/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/son/torbutton.dtd
+++ b/src/chrome/locale/son/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd
index 4e56c4b..797dd65 100644
--- a/src/chrome/locale/sr/torbutton.dtd
+++ b/src/chrome/locale/sr/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ">
-<!ENTITY torbutton.prefs.display_settings "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð°">
-<!ENTITY torbutton.prefs.display_panel "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ° Ñƒ ÑÑ‚Ð°Ñ‚ÑƒÑÐ½Ð¾Ñ˜ Ñ‚Ñ€Ð°Ñ†Ð¸">
-<!ENTITY torbutton.prefs.panel_format "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°ÑšÐ° ÑÑ‚Ð°Ñ‚ÑƒÑÐ½Ðµ Ñ‚Ñ€Ð°ÐºÐµ:">
-<!ENTITY torbutton.prefs.panel_text_format "Ð¢ÐµÐºÑÑ‚">
-<!ENTITY torbutton.prefs.panel_icon_format "Ð˜ÐºÐ¾Ð½Ð°">
 <!ENTITY torbutton.prefs.tor_settings "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°">
 <!ENTITY torbutton.prefs.recommended_settings "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÐµÐ½Ðµ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ° Ð·Ð° Ð¼Ð¾Ñ˜Ðµ Ð¸Ð·Ð´Ð°ÑšÐµ Ñ„Ð°Ñ˜ÐµÑ€Ñ„Ð¾ÐºÑÐ°">
 <!ENTITY torbutton.prefs.use_privoxy "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Privoxy">
diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/st/torbutton.dtd
+++ b/src/chrome/locale/st/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/su/torbutton.dtd
+++ b/src/chrome/locale/su/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 447668e..8a5c681 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "InstÃ¤llningar fÃ¶r Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Visa InstÃ¤llningar">
-<!ENTITY torbutton.prefs.display_panel "Visa instÃ¤llningar fÃ¶r Tor proxy i statusraden">
-<!ENTITY torbutton.prefs.panel_format "Status meny visningsformat">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Ikon">
 <!ENTITY torbutton.prefs.tor_settings "InstÃ¤llningar fÃ¶r proxy">
 <!ENTITY torbutton.prefs.recommended_settings "AnvÃ¤nd dom instÃ¤llningar som rekommenderas fÃ¶r min version av Firefox fÃ¶r att stÃ¤lla in proxyn">
 <!ENTITY torbutton.prefs.use_privoxy "AnvÃ¤nd Privoxy">
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ta/torbutton.dtd
+++ b/src/chrome/locale/ta/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/te/torbutton.dtd
+++ b/src/chrome/locale/te/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/tg/torbutton.dtd
+++ b/src/chrome/locale/tg/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index e2f5af5..4baeb82 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "à¸à¸³à¸«à¸™à¸”à¸„à¸§à¸²à¸¡à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¸‚à¸à¸‡à¸«à¸™à¹‰à¸²à¸ˆà¸">
-<!ENTITY torbutton.prefs.display_panel "à¹à¸ªà¸”à¸‡à¸„à¹ˆà¸² Proxy à¸—à¸µà¹ˆ Status Bar">
-<!ENTITY torbutton.prefs.panel_format "à¹à¸šà¸šà¸à¸²à¸£à¹à¸ªà¸”à¸‡à¸œà¸¥à¸—à¸µà¹ˆ Status Bar :">
-<!ENTITY torbutton.prefs.panel_text_format "à¹à¸šà¸šà¸à¸±à¸à¸©à¸£">
-<!ENTITY torbutton.prefs.panel_icon_format "à¹„à¸à¸„à¸à¸™">
 <!ENTITY torbutton.prefs.tor_settings "à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸² Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "à¸™à¸³à¸„à¹ˆà¹‰à¸² Proxy à¸—à¸µà¹ˆà¹€à¸«à¸¡à¸²à¸°à¸ªà¸¡à¸¡à¸²à¹ƒà¸Šà¹‰à¸à¸±à¸š Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "à¸™à¸³ Privoxy à¸¡à¸²à¹ƒà¸Šà¹‰">
diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ti/torbutton.dtd
+++ b/src/chrome/locale/ti/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/tk/torbutton.dtd
+++ b/src/chrome/locale/tk/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 864edff..a72e51e 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Ayarlar">
-<!ENTITY torbutton.prefs.display_settings "GÃ¶rÃ¼nÃ¼m">
-<!ENTITY torbutton.prefs.display_panel "Durum Ã§ubuÄŸunda proxy ayarlarÄ±nÄ± gÃ¶ster">
-<!ENTITY torbutton.prefs.panel_format "Durum Ã§ubuÄŸu gÃ¶rÃ¼ntÃ¼leme formatÄ±:">
-<!ENTITY torbutton.prefs.panel_text_format "Metin">
-<!ENTITY torbutton.prefs.panel_icon_format "Ä°kon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Firefoxta varsayÄ±lan proxy ayarlarÄ±mÄ± kullan">
 <!ENTITY torbutton.prefs.use_privoxy "Proxoy'i kullan">
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 8f81d47..c52fa2e 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Torbutton">
-<!ENTITY torbutton.prefs.display_settings "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸">
-<!ENTITY torbutton.prefs.display_panel "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ ÑÑ‚Ð°Ð½ Ð¿Ñ€Ð¾ÐºÑÑ– Tor Ñƒ Ñ€ÑÐ´ÐºÑƒ ÑÑ‚Ð°Ð½Ñƒ">
-<!ENTITY torbutton.prefs.panel_format "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚ Ð¿Ð¾Ð»Ñ Ñƒ Ñ€ÑÐ´ÐºÑƒ ÑÑ‚Ð°Ð½Ñƒ">
-<!ENTITY torbutton.prefs.panel_text_format "Ð¢ÐµÐºÑÑ‚">
-<!ENTITY torbutton.prefs.panel_icon_format "Ð—Ð½Ð°Ñ‡Ð¾Ðº">
 <!ENTITY torbutton.prefs.tor_settings "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð¿Ñ€Ð¾ÐºÑÑ–">
 <!ENTITY torbutton.prefs.recommended_settings "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ñ– Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð´Ð»Ñ Ð¼Ð¾Ñ”Ñ— Ð²ÐµÑ€ÑÑ–Ñ— Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Privoxy">
diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ur/torbutton.dtd
+++ b/src/chrome/locale/ur/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/ve/torbutton.dtd
+++ b/src/chrome/locale/ve/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 55810b5..93fdecc 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "TÃ¹y chá»‰nh Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Thiáº¿t láºp Hiá»ƒn thá»‹">
-<!ENTITY torbutton.prefs.display_panel "Hiá»ƒn thá»‹ thiáº¿t láºp proxy Tor trong thanh tráº¡ng thÃ¡i">
-<!ENTITY torbutton.prefs.panel_format "Äá»‹nh dáº¡ng hiá»ƒn thá»‹ thanh tráº¡ng thÃ¡i:">
-<!ENTITY torbutton.prefs.panel_text_format "Chá»¯">
-<!ENTITY torbutton.prefs.panel_icon_format "Biá»ƒu tÆ°á»£ng">
 <!ENTITY torbutton.prefs.tor_settings "Thiáº¿t láºp Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "DÃ¹ng thiáº¿t láºp proxy Ä‘Ã£ khuyáº¿n nghá»‹ cho Firefox cá»§a tÃ´i">
 <!ENTITY torbutton.prefs.use_privoxy "DÃ¹ng Privoxy">
diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/wa/torbutton.dtd
+++ b/src/chrome/locale/wa/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/wo/torbutton.dtd
+++ b/src/chrome/locale/wo/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index b228062..96ef968 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton é¦–é€‰é¡¹">
-<!ENTITY torbutton.prefs.display_settings "æ˜¾ç¤ºè®¾ç½®">
-<!ENTITY torbutton.prefs.display_panel "åœ¨çŠ¶æ€æ æ˜¾ç¤º Tor ä»£ç†è®¾ç½®">
-<!ENTITY torbutton.prefs.panel_format "çŠ¶æ€æ æ˜¾ç¤ºæ ¼å¼ï¼š">
-<!ENTITY torbutton.prefs.panel_text_format "æ–‡æœ¬">
-<!ENTITY torbutton.prefs.panel_icon_format "å›¾æ ‡">
 <!ENTITY torbutton.prefs.tor_settings "ä»£ç†è®¾ç½®">
 <!ENTITY torbutton.prefs.recommended_settings "ä¸ºè¯¥ç‰ˆæœ¬ Firefox ä½¿ç”¨æŽ¨èçš„ä»£ç†è®¾ç½®">
 <!ENTITY torbutton.prefs.use_privoxy "ä½¿ç”¨ Privoxy">
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index bc7959c..e2ee3d3 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton è¨ç½®">
-<!ENTITY torbutton.prefs.display_settings "é¡¯ç¤ºè¨å®š">
-<!ENTITY torbutton.prefs.display_panel "åœ¨ç‹€æ…‹åˆ—é¡¯ç¤º Tor proxy è¨å®š">
-<!ENTITY torbutton.prefs.panel_format "ç‹€æ…‹åˆ—é¡¯ç¤ºæ ¼å¼:">
-<!ENTITY torbutton.prefs.panel_text_format "æ–‡å—">
-<!ENTITY torbutton.prefs.panel_icon_format "åœ–ç¤º">
 <!ENTITY torbutton.prefs.tor_settings "Proxy è¨å®š">
 <!ENTITY torbutton.prefs.recommended_settings "åœ¨Firefox ä½¿ç”¨å»ºè°çš„ Proxy è¨å®š">
 <!ENTITY torbutton.prefs.use_privoxy "ä½¿ç”¨ Privoxy">
diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd
index cbda0a2..890a59c 100644
--- a/src/chrome/locale/zu/torbutton.dtd
+++ b/src/chrome/locale/zu/torbutton.dtd
@@ -1,9 +1,4 @@
 <!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">



