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

[tor-commits] [tor-launcher/master] Bug 23262: implement integrated progress bar (Part 1)



commit 09234581a042a648e99e2981799e2c4dbf53100c
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date:   Mon Oct 30 16:58:21 2017 -0400

    Bug 23262: implement integrated progress bar (Part 1)
    
    Replace the old progress window with a progress page that is part
      of the setup wizard and a progress panel that is part of the
      Network Settings window.
---
 src/chrome/content/network-settings-overlay.xul    |  12 +
 src/chrome/content/network-settings-wizard.xul     |  45 +--
 src/chrome/content/network-settings.js             | 318 +++++++++++++++++----
 src/chrome/content/network-settings.xul            |   5 +-
 src/chrome/content/progress.js                     | 249 ----------------
 src/chrome/content/progress.xul                    |  45 ---
 src/chrome/locale/ach/network-settings.dtd         |   3 +
 src/chrome/locale/ach/progress.dtd                 |   4 -
 src/chrome/locale/ady/network-settings.dtd         |   3 +
 src/chrome/locale/ady/progress.dtd                 |   4 -
 src/chrome/locale/af-ZA/network-settings.dtd       |   3 +
 src/chrome/locale/af-ZA/progress.dtd               |   4 -
 src/chrome/locale/af/network-settings.dtd          |   3 +
 src/chrome/locale/af/progress.dtd                  |   4 -
 src/chrome/locale/ak/network-settings.dtd          |   3 +
 src/chrome/locale/ak/progress.dtd                  |   4 -
 src/chrome/locale/am-ET/network-settings.dtd       |   3 +
 src/chrome/locale/am-ET/progress.dtd               |   4 -
 src/chrome/locale/am/network-settings.dtd          |   3 +
 src/chrome/locale/am/progress.dtd                  |   4 -
 src/chrome/locale/ar/network-settings.dtd          |   3 +
 src/chrome/locale/ar/progress.dtd                  |   4 -
 src/chrome/locale/arn/network-settings.dtd         |   3 +
 src/chrome/locale/arn/progress.dtd                 |   4 -
 src/chrome/locale/ast/network-settings.dtd         |   3 +
 src/chrome/locale/ast/progress.dtd                 |   4 -
 src/chrome/locale/az/network-settings.dtd          |   3 +
 src/chrome/locale/az/progress.dtd                  |   4 -
 src/chrome/locale/be/network-settings.dtd          |   3 +
 src/chrome/locale/be/progress.dtd                  |   4 -
 src/chrome/locale/bg-BG/network-settings.dtd       |   3 +
 src/chrome/locale/bg-BG/progress.dtd               |   4 -
 src/chrome/locale/bg/network-settings.dtd          |   3 +
 src/chrome/locale/bg/progress.dtd                  |   4 -
 src/chrome/locale/bn-BD/network-settings.dtd       |   3 +
 src/chrome/locale/bn-BD/progress.dtd               |   4 -
 src/chrome/locale/bn-IN/network-settings.dtd       |   3 +
 src/chrome/locale/bn-IN/progress.dtd               |   4 -
 src/chrome/locale/bn/network-settings.dtd          |   3 +
 src/chrome/locale/bn/progress.dtd                  |   4 -
 src/chrome/locale/bo/network-settings.dtd          |   3 +
 src/chrome/locale/bo/progress.dtd                  |   4 -
 src/chrome/locale/br/network-settings.dtd          |   3 +
 src/chrome/locale/br/progress.dtd                  |   4 -
 src/chrome/locale/bs/network-settings.dtd          |   3 +
 src/chrome/locale/bs/progress.dtd                  |   4 -
 src/chrome/locale/ca/network-settings.dtd          |   3 +
 src/chrome/locale/ca/progress.dtd                  |   4 -
 src/chrome/locale/ca@valencia/network-settings.dtd |   3 +
 src/chrome/locale/ca@valencia/progress.dtd         |   4 -
 src/chrome/locale/cs-CZ/network-settings.dtd       |   3 +
 src/chrome/locale/cs-CZ/progress.dtd               |   4 -
 src/chrome/locale/cs/network-settings.dtd          |   3 +
 src/chrome/locale/cs/progress.dtd                  |   4 -
 src/chrome/locale/csb/network-settings.dtd         |   3 +
 src/chrome/locale/csb/progress.dtd                 |   4 -
 src/chrome/locale/cv/network-settings.dtd          |   3 +
 src/chrome/locale/cv/progress.dtd                  |   4 -
 src/chrome/locale/cy/network-settings.dtd          |   3 +
 src/chrome/locale/cy/progress.dtd                  |   4 -
 src/chrome/locale/da/network-settings.dtd          |   3 +
 src/chrome/locale/da/progress.dtd                  |   4 -
 src/chrome/locale/de/network-settings.dtd          |   3 +
 src/chrome/locale/de/progress.dtd                  |   4 -
 src/chrome/locale/dz/network-settings.dtd          |   3 +
 src/chrome/locale/dz/progress.dtd                  |   4 -
 src/chrome/locale/el-GR/network-settings.dtd       |   3 +
 src/chrome/locale/el-GR/progress.dtd               |   4 -
 src/chrome/locale/el/network-settings.dtd          |   3 +
 src/chrome/locale/el/progress.dtd                  |   4 -
 src/chrome/locale/en-GB/network-settings.dtd       |   3 +
 src/chrome/locale/en-GB/progress.dtd               |   4 -
 src/chrome/locale/en/network-settings.dtd          |   3 +
 src/chrome/locale/en/progress.dtd                  |   4 -
 src/chrome/locale/eo/network-settings.dtd          |   3 +
 src/chrome/locale/eo/progress.dtd                  |   4 -
 src/chrome/locale/es-AR/network-settings.dtd       |   3 +
 src/chrome/locale/es-AR/progress.dtd               |   4 -
 src/chrome/locale/es-CL/network-settings.dtd       |   3 +
 src/chrome/locale/es-CL/progress.dtd               |   4 -
 src/chrome/locale/es-CO/network-settings.dtd       |   3 +
 src/chrome/locale/es-CO/progress.dtd               |   4 -
 src/chrome/locale/es-MX/network-settings.dtd       |   3 +
 src/chrome/locale/es-MX/progress.dtd               |   4 -
 src/chrome/locale/es-NI/network-settings.dtd       |   3 +
 src/chrome/locale/es-NI/progress.dtd               |   4 -
 src/chrome/locale/es/network-settings.dtd          |   3 +
 src/chrome/locale/es/progress.dtd                  |   4 -
 src/chrome/locale/et/network-settings.dtd          |   3 +
 src/chrome/locale/et/progress.dtd                  |   4 -
 src/chrome/locale/eu/network-settings.dtd          |   3 +
 src/chrome/locale/eu/progress.dtd                  |   4 -
 src/chrome/locale/fa/network-settings.dtd          |   3 +
 src/chrome/locale/fa/progress.dtd                  |   4 -
 src/chrome/locale/fi/network-settings.dtd          |   3 +
 src/chrome/locale/fi/progress.dtd                  |   5 -
 src/chrome/locale/fil/network-settings.dtd         |   3 +
 src/chrome/locale/fil/progress.dtd                 |   4 -
 src/chrome/locale/fo/network-settings.dtd          |   3 +
 src/chrome/locale/fo/progress.dtd                  |   4 -
 src/chrome/locale/fr-CA/network-settings.dtd       |   3 +
 src/chrome/locale/fr-CA/progress.dtd               |   4 -
 src/chrome/locale/fr/network-settings.dtd          |   3 +
 src/chrome/locale/fr/progress.dtd                  |   4 -
 src/chrome/locale/fur/network-settings.dtd         |   3 +
 src/chrome/locale/fur/progress.dtd                 |   4 -
 src/chrome/locale/fy/network-settings.dtd          |   3 +
 src/chrome/locale/fy/progress.dtd                  |   4 -
 src/chrome/locale/ga/network-settings.dtd          |   3 +
 src/chrome/locale/ga/progress.dtd                  |   4 -
 src/chrome/locale/gl/network-settings.dtd          |   3 +
 src/chrome/locale/gl/progress.dtd                  |   4 -
 src/chrome/locale/gu-IN/network-settings.dtd       |   3 +
 src/chrome/locale/gu-IN/progress.dtd               |   4 -
 src/chrome/locale/gu/network-settings.dtd          |   3 +
 src/chrome/locale/gu/progress.dtd                  |   4 -
 src/chrome/locale/gun/network-settings.dtd         |   3 +
 src/chrome/locale/gun/progress.dtd                 |   4 -
 src/chrome/locale/ha/network-settings.dtd          |   3 +
 src/chrome/locale/ha/progress.dtd                  |   4 -
 src/chrome/locale/he/network-settings.dtd          |   3 +
 src/chrome/locale/he/progress.dtd                  |   4 -
 src/chrome/locale/hi/network-settings.dtd          |   3 +
 src/chrome/locale/hi/progress.dtd                  |   4 -
 src/chrome/locale/hr-HR/network-settings.dtd       |   3 +
 src/chrome/locale/hr-HR/progress.dtd               |   4 -
 src/chrome/locale/hr/network-settings.dtd          |   3 +
 src/chrome/locale/hr/progress.dtd                  |   4 -
 src/chrome/locale/ht/network-settings.dtd          |   3 +
 src/chrome/locale/ht/progress.dtd                  |   4 -
 src/chrome/locale/hu/network-settings.dtd          |   3 +
 src/chrome/locale/hu/progress.dtd                  |   4 -
 src/chrome/locale/hy-AM/network-settings.dtd       |   3 +
 src/chrome/locale/hy-AM/progress.dtd               |   4 -
 src/chrome/locale/hy/network-settings.dtd          |   3 +
 src/chrome/locale/hy/progress.dtd                  |   4 -
 src/chrome/locale/ia/network-settings.dtd          |   3 +
 src/chrome/locale/ia/progress.dtd                  |   4 -
 src/chrome/locale/id/network-settings.dtd          |   3 +
 src/chrome/locale/id/progress.dtd                  |   4 -
 src/chrome/locale/is/network-settings.dtd          |   3 +
 src/chrome/locale/is/progress.dtd                  |   4 -
 src/chrome/locale/it/network-settings.dtd          |   3 +
 src/chrome/locale/it/progress.dtd                  |   4 -
 src/chrome/locale/ja/network-settings.dtd          |   3 +
 src/chrome/locale/ja/progress.dtd                  |   4 -
 src/chrome/locale/jv/network-settings.dtd          |   3 +
 src/chrome/locale/jv/progress.dtd                  |   4 -
 src/chrome/locale/ka/network-settings.dtd          |   3 +
 src/chrome/locale/ka/progress.dtd                  |   4 -
 src/chrome/locale/kk/network-settings.dtd          |   3 +
 src/chrome/locale/kk/progress.dtd                  |   4 -
 src/chrome/locale/km/network-settings.dtd          |   3 +
 src/chrome/locale/km/progress.dtd                  |   4 -
 src/chrome/locale/kn/network-settings.dtd          |   3 +
 src/chrome/locale/kn/progress.dtd                  |   4 -
 src/chrome/locale/ko-KR/network-settings.dtd       |   3 +
 src/chrome/locale/ko-KR/progress.dtd               |   4 -
 src/chrome/locale/ko/network-settings.dtd          |   3 +
 src/chrome/locale/ko/progress.dtd                  |   4 -
 src/chrome/locale/ku/network-settings.dtd          |   3 +
 src/chrome/locale/ku/progress.dtd                  |   4 -
 src/chrome/locale/kw/network-settings.dtd          |   3 +
 src/chrome/locale/kw/progress.dtd                  |   4 -
 src/chrome/locale/ky/network-settings.dtd          |   3 +
 src/chrome/locale/ky/progress.dtd                  |   4 -
 src/chrome/locale/lb/network-settings.dtd          |   3 +
 src/chrome/locale/lb/progress.dtd                  |   4 -
 src/chrome/locale/lg/network-settings.dtd          |   3 +
 src/chrome/locale/lg/progress.dtd                  |   4 -
 src/chrome/locale/ln/network-settings.dtd          |   3 +
 src/chrome/locale/ln/progress.dtd                  |   4 -
 src/chrome/locale/lo/network-settings.dtd          |   3 +
 src/chrome/locale/lo/progress.dtd                  |   4 -
 src/chrome/locale/lt/network-settings.dtd          |   3 +
 src/chrome/locale/lt/progress.dtd                  |   4 -
 src/chrome/locale/lv/network-settings.dtd          |   3 +
 src/chrome/locale/lv/progress.dtd                  |   4 -
 src/chrome/locale/mg/network-settings.dtd          |   3 +
 src/chrome/locale/mg/progress.dtd                  |   4 -
 src/chrome/locale/mi/network-settings.dtd          |   3 +
 src/chrome/locale/mi/progress.dtd                  |   4 -
 src/chrome/locale/mk/network-settings.dtd          |   3 +
 src/chrome/locale/mk/progress.dtd                  |   4 -
 src/chrome/locale/ml/network-settings.dtd          |   3 +
 src/chrome/locale/ml/progress.dtd                  |   4 -
 src/chrome/locale/mn/network-settings.dtd          |   3 +
 src/chrome/locale/mn/progress.dtd                  |   4 -
 src/chrome/locale/mr/network-settings.dtd          |   3 +
 src/chrome/locale/mr/progress.dtd                  |   4 -
 src/chrome/locale/ms-MY/network-settings.dtd       |   3 +
 src/chrome/locale/ms-MY/progress.dtd               |   4 -
 src/chrome/locale/mt/network-settings.dtd          |   3 +
 src/chrome/locale/mt/progress.dtd                  |   4 -
 src/chrome/locale/my/network-settings.dtd          |   3 +
 src/chrome/locale/my/progress.dtd                  |   4 -
 src/chrome/locale/nah/network-settings.dtd         |   3 +
 src/chrome/locale/nah/progress.dtd                 |   4 -
 src/chrome/locale/nap/network-settings.dtd         |   3 +
 src/chrome/locale/nap/progress.dtd                 |   4 -
 src/chrome/locale/nb/network-settings.dtd          |   3 +
 src/chrome/locale/nb/progress.dtd                  |   4 -
 src/chrome/locale/nds/network-settings.dtd         |   3 +
 src/chrome/locale/nds/progress.dtd                 |   4 -
 src/chrome/locale/ne/network-settings.dtd          |   3 +
 src/chrome/locale/ne/progress.dtd                  |   4 -
 src/chrome/locale/nl-BE/network-settings.dtd       |   3 +
 src/chrome/locale/nl-BE/progress.dtd               |   4 -
 src/chrome/locale/nl/network-settings.dtd          |   3 +
 src/chrome/locale/nl/progress.dtd                  |   5 -
 src/chrome/locale/nn/network-settings.dtd          |   3 +
 src/chrome/locale/nn/progress.dtd                  |   4 -
 src/chrome/locale/nso/network-settings.dtd         |   3 +
 src/chrome/locale/nso/progress.dtd                 |   4 -
 src/chrome/locale/oc/network-settings.dtd          |   3 +
 src/chrome/locale/oc/progress.dtd                  |   4 -
 src/chrome/locale/or/network-settings.dtd          |   3 +
 src/chrome/locale/or/progress.dtd                  |   4 -
 src/chrome/locale/pa/network-settings.dtd          |   3 +
 src/chrome/locale/pa/progress.dtd                  |   4 -
 src/chrome/locale/pap/network-settings.dtd         |   3 +
 src/chrome/locale/pap/progress.dtd                 |   4 -
 src/chrome/locale/pl-PL/network-settings.dtd       |   3 +
 src/chrome/locale/pl-PL/progress.dtd               |   4 -
 src/chrome/locale/pl/network-settings.dtd          |   3 +
 src/chrome/locale/pl/progress.dtd                  |   4 -
 src/chrome/locale/pms/network-settings.dtd         |   3 +
 src/chrome/locale/pms/progress.dtd                 |   4 -
 src/chrome/locale/ps/network-settings.dtd          |   3 +
 src/chrome/locale/ps/progress.dtd                  |   4 -
 src/chrome/locale/pt-BR/network-settings.dtd       |   3 +
 src/chrome/locale/pt-BR/progress.dtd               |   4 -
 src/chrome/locale/pt/network-settings.dtd          |   3 +
 src/chrome/locale/pt/progress.dtd                  |   4 -
 src/chrome/locale/ro/network-settings.dtd          |   3 +
 src/chrome/locale/ro/progress.dtd                  |   4 -
 src/chrome/locale/ru/network-settings.dtd          |   3 +
 src/chrome/locale/ru/progress.dtd                  |   4 -
 src/chrome/locale/ru@petr1708/network-settings.dtd |   3 +
 src/chrome/locale/ru@petr1708/progress.dtd         |   4 -
 src/chrome/locale/sco/network-settings.dtd         |   3 +
 src/chrome/locale/sco/progress.dtd                 |   4 -
 src/chrome/locale/si-LK/network-settings.dtd       |   3 +
 src/chrome/locale/si-LK/progress.dtd               |   4 -
 src/chrome/locale/sk-SK/network-settings.dtd       |   3 +
 src/chrome/locale/sk-SK/progress.dtd               |   4 -
 src/chrome/locale/sk/network-settings.dtd          |   3 +
 src/chrome/locale/sk/progress.dtd                  |   4 -
 src/chrome/locale/sl-SI/network-settings.dtd       |   3 +
 src/chrome/locale/sl-SI/progress.dtd               |   4 -
 src/chrome/locale/sl/network-settings.dtd          |   3 +
 src/chrome/locale/sl/progress.dtd                  |   4 -
 src/chrome/locale/sn/network-settings.dtd          |   3 +
 src/chrome/locale/sn/progress.dtd                  |   4 -
 src/chrome/locale/so/network-settings.dtd          |   3 +
 src/chrome/locale/so/progress.dtd                  |   4 -
 src/chrome/locale/son/network-settings.dtd         |   3 +
 src/chrome/locale/son/progress.dtd                 |   4 -
 src/chrome/locale/sq-AL/network-settings.dtd       |   3 +
 src/chrome/locale/sq-AL/progress.dtd               |   4 -
 src/chrome/locale/sq/network-settings.dtd          |   3 +
 src/chrome/locale/sq/progress.dtd                  |   4 -
 src/chrome/locale/sr/network-settings.dtd          |   3 +
 src/chrome/locale/sr/progress.dtd                  |   4 -
 src/chrome/locale/sr@latin/network-settings.dtd    |   3 +
 src/chrome/locale/sr@latin/progress.dtd            |   4 -
 src/chrome/locale/st/network-settings.dtd          |   3 +
 src/chrome/locale/st/progress.dtd                  |   4 -
 src/chrome/locale/su/network-settings.dtd          |   3 +
 src/chrome/locale/su/progress.dtd                  |   4 -
 src/chrome/locale/sv-SE/network-settings.dtd       |   3 +
 src/chrome/locale/sv-SE/progress.dtd               |   4 -
 src/chrome/locale/sv/network-settings.dtd          |   3 +
 src/chrome/locale/sv/progress.dtd                  |   4 -
 src/chrome/locale/sw/network-settings.dtd          |   3 +
 src/chrome/locale/sw/progress.dtd                  |   4 -
 src/chrome/locale/szl/network-settings.dtd         |   3 +
 src/chrome/locale/szl/progress.dtd                 |   4 -
 src/chrome/locale/ta/network-settings.dtd          |   3 +
 src/chrome/locale/ta/progress.dtd                  |   4 -
 src/chrome/locale/te-IN/network-settings.dtd       |   3 +
 src/chrome/locale/te-IN/progress.dtd               |   4 -
 src/chrome/locale/te/network-settings.dtd          |   3 +
 src/chrome/locale/te/progress.dtd                  |   4 -
 src/chrome/locale/tg/network-settings.dtd          |   3 +
 src/chrome/locale/tg/progress.dtd                  |   4 -
 src/chrome/locale/th/network-settings.dtd          |   3 +
 src/chrome/locale/th/progress.dtd                  |   4 -
 src/chrome/locale/ti/network-settings.dtd          |   3 +
 src/chrome/locale/ti/progress.dtd                  |   4 -
 src/chrome/locale/tk/network-settings.dtd          |   3 +
 src/chrome/locale/tk/progress.dtd                  |   4 -
 src/chrome/locale/tr/network-settings.dtd          |   3 +
 src/chrome/locale/tr/progress.dtd                  |   4 -
 src/chrome/locale/uk/network-settings.dtd          |   3 +
 src/chrome/locale/uk/progress.dtd                  |   4 -
 src/chrome/locale/ur-PK/network-settings.dtd       |   3 +
 src/chrome/locale/ur-PK/progress.dtd               |   4 -
 src/chrome/locale/ur/network-settings.dtd          |   3 +
 src/chrome/locale/ur/progress.dtd                  |   4 -
 src/chrome/locale/uz/network-settings.dtd          |   3 +
 src/chrome/locale/uz/progress.dtd                  |   4 -
 src/chrome/locale/ve/network-settings.dtd          |   3 +
 src/chrome/locale/ve/progress.dtd                  |   4 -
 src/chrome/locale/vi/network-settings.dtd          |   3 +
 src/chrome/locale/vi/progress.dtd                  |   4 -
 src/chrome/locale/wa/network-settings.dtd          |   3 +
 src/chrome/locale/wa/progress.dtd                  |   4 -
 src/chrome/locale/wo/network-settings.dtd          |   3 +
 src/chrome/locale/wo/progress.dtd                  |   4 -
 .../locale/zh-CN.GB2312/network-settings.dtd       |   3 +
 src/chrome/locale/zh-CN.GB2312/progress.dtd        |   4 -
 src/chrome/locale/zh-CN/network-settings.dtd       |   3 +
 src/chrome/locale/zh-CN/progress.dtd               |   4 -
 src/chrome/locale/zh-HK/network-settings.dtd       |   3 +
 src/chrome/locale/zh-HK/progress.dtd               |   4 -
 src/chrome/locale/zh-TW/network-settings.dtd       |   3 +
 src/chrome/locale/zh-TW/progress.dtd               |   4 -
 src/chrome/locale/zh/network-settings.dtd          |   6 +
 src/chrome/locale/zh/progress.dtd                  |   4 -
 src/chrome/locale/zu/network-settings.dtd          |   3 +
 src/chrome/locale/zu/progress.dtd                  |   4 -
 src/chrome/skin/network-settings.css               |  13 +
 src/chrome/skin/progress.css                       |  44 ---
 src/components/tl-process.js                       |  29 +-
 325 files changed, 804 insertions(+), 1067 deletions(-)

diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul
index 8f1bc45..a709f0e 100644
--- a/src/chrome/content/network-settings-overlay.xul
+++ b/src/chrome/content/network-settings-overlay.xul
@@ -128,6 +128,18 @@
     <description>&torsettings.bridgeHelp2;</description>
   </vbox>
 
+  <vbox id="progressContent">
+    <hbox class="tbb-header" pack="center">
+      <image class="tbb-logo"/>
+    </hbox>
+    <vbox flex="1">
+      <description id="progressPleaseWait"
+                   hidden="true">&torprogress.pleaseWait;</description>
+      <progressmeter id="progressMeter" mode="determined" value="0"/>
+      <description id="progressDesc"/>
+    </vbox>
+  </vbox>
+
   <panel id="copyLogFeedbackPanel" type="arrow" fade="slow"
          onclick="closeCopyLogFeedbackPanel()">
      <description flex="1" />
diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul
index 5d76331..97e846c 100644
--- a/src/chrome/content/network-settings-wizard.xul
+++ b/src/chrome/content/network-settings-wizard.xul
@@ -19,7 +19,7 @@
         windowtype="TorLauncher:NetworkSettings"
         persist="screenX screenY"
         buttonlabelextra2="&torsettings.copyLog;"
-        onwizardfinish="return applySettings(false);"
+        onwizardfinish="return onWizardFinish();"
         onwizardcancel="return onCancel();"
         onload="initDialog();"
         onunload="deinitDialog();">
@@ -50,10 +50,22 @@
   <wizardpage pageid="configureSettings" onextra2="onCopyLog();"
               windowtitle="&torsettings.wizard.title.configure;"
               torShowNavButtons="true">
-    <separator class="tall"/>
-    <vbox id="bridgeSettings"/>
-    <separator/>
-    <vbox id="proxySettings"/>
+    <stack flex="1">
+      <vbox>
+        <separator class="tall"/>
+        <vbox id="bridgeSettings"/>
+        <separator/>
+        <vbox id="proxySettings"/>
+      </vbox>
+    </stack>
+  </wizardpage>
+
+  <wizardpage pageid="progress" onextra2="onCopyLog();"
+              windowtitle="&torsettings.wizard.title.connecting;"
+              torShowNavButtons="false"
+              onpageshow="onShowProgressPanel();"
+              onpagehide="return resetProgressNavButtons();">
+    <vbox id="progressContent"/>
   </wizardpage>
 
   <wizardpage pageid="startingTor" next="notUsed" torShowNavButtons="false">
@@ -69,22 +81,21 @@
     <spring flex="1" />
   </wizardpage>
 
-  <wizardpage pageid="errorPanel" next="notUsed" torShowNavButtons="false"
-              onextra2="onCopyLog();">
+  <wizardpage pageid="restartPanel" next="notUsed"
+              pack="center" torShowNavButtons="false" onextra2="onCopyLog();">
+    <vbox id="restartContent"/>
+  </wizardpage>
+
+  <wizardpage pageid="errorPanel" next="notUsed"
+              torShowNavButtons="false" onextra2="onCopyLog();">
     <spring flex="1" />
-    <hbox>
-      <spring flex="1" />
-      <description id="errorPanelMessage" flex="1" />
-      <spring flex="1" />
+    <hbox pack="center">
+      <description errorElemId="message" flex="1"/>
     </hbox>
     <separator/>
-    <hbox>
-      <spring flex="1" />
-      <button id="restartTorButton" label="&torsettings.restartTor;"
-              hidden="true" oncommand="onRestartTor()" />
-      <button id="reconfigTorButton" label="&torsettings.reconfigTor;"
+    <hbox pack="center">
+      <button errorElemId="reconfigButton" label="&torsettings.reconfigTor;"
               hidden="true" oncommand="onWizardReconfig()" />
-      <spring flex="1" />
     </hbox>
     <spring flex="1" />
   </wizardpage>
diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index f8dcb3b..2237c85 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -31,11 +31,15 @@ const kSupportURL = "torproject.org/about/contact.html#support";
 const kTorProcessReadyTopic = "TorProcessIsReady";
 const kTorProcessExitedTopic = "TorProcessExited";
 const kTorProcessDidNotStartTopic = "TorProcessDidNotStart";
-const kTorOpenProgressTopic = "TorOpenProgressDialog";
+const kTorShowProgressPanelTopic = "TorShowProgressPanel";
+const kTorBootstrapStatusTopic = "TorBootstrapStatus";
 const kTorBootstrapErrorTopic = "TorBootstrapError";
 const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr";
 
 const kWizardFirstPageID = "first";
+const kWizardDiscardSettingsPageID = "discardSettings";
+const kWizardProgressPageID = "progress";                 // wizard
+const kNetworkSettingsProgressPanelID = "progressPanel";  // non wizard
 
 const kLocaleList = "localeList";
 const kUseProxyCheckbox = "useProxy";
@@ -65,15 +69,17 @@ const kTorConfKeyBridgeList = "Bridge";
 var gProtocolSvc = null;
 var gTorProcessService = null;
 var gObsService = null;
+var gCancelLabelStr = undefined;
 var gIsInitialBootstrap = false;
 var gInitialPanelID = undefined;
-var gIsBootstrapComplete = false;
+var gShowProgressTimer = undefined;
 var gRestoreAfterHelpPanelID = null;
 var gIsPostRestartBootstrapNeeded = false;
+var gIsWindowScheduledToClose = false;
 var gActiveTopics = [];  // Topics for which an observer is currently installed.
 
 
-function initDialogCommon(aHasQuitButton)
+function initDialogCommon()
 {
   gObsService = Cc["@mozilla.org/observer-service;1"]
                   .getService(Ci.nsIObserverService);
@@ -91,18 +97,20 @@ function initDialogCommon(aHasQuitButton)
                                         "forAssistance2", [kSupportURL], 1);
   }
 
-  if (aHasQuitButton)
+  let wizardElem = getWizard();
+  let haveWizard = (wizardElem != null);
+
+  let cancelBtn = document.documentElement.getButton("cancel");
+  if (cancelBtn)
   {
-    let cancelBtn = document.documentElement.getButton("cancel");
-    if (cancelBtn)
+    gCancelLabelStr = cancelBtn.label;
+    if (haveWizard)
     {
       let quitKey = isWindows ? "quit_win" : "quit";
       cancelBtn.label = TorLauncherUtil.getLocalizedString(quitKey);
     }
   }
 
-  let wizardElem = getWizard();
-  let haveWizard = (wizardElem != null);
   if (haveWizard)
   {
     // Hide the Tor Browser logo and associated separator element if the
@@ -135,21 +143,14 @@ function resizeDialogToFitContent()
 function initDialog()
 {
   gIsInitialBootstrap = window.arguments[0];
-  initDialogCommon(gIsInitialBootstrap);
+  initDialogCommon();
 
   if (window.arguments.length > 1)
     gInitialPanelID = window.arguments[1];
 
-  if (gIsInitialBootstrap)
-  {
-    var okBtn = document.documentElement.getButton("accept");
-    if (okBtn)
-      okBtn.label = TorLauncherUtil.getLocalizedString("connect");
-  }
-
   try
   {
-    var svc = Cc["@torproject.org/torlauncher-protocol-service;1"]
+    let svc = Cc["@torproject.org/torlauncher-protocol-service;1"]
                 .getService(Ci.nsISupports);
     gProtocolSvc = svc.wrappedJSObject;
   }
@@ -157,22 +158,27 @@ function initDialog()
 
   try
   {
-    var svc = Cc["@torproject.org/torlauncher-process-service;1"]
+    let svc = Cc["@torproject.org/torlauncher-process-service;1"]
                 .getService(Ci.nsISupports);
     gTorProcessService = svc.wrappedJSObject;
   }
   catch (e) { dump(e + "\n"); }
 
-  var wizardElem = getWizard();
-  var haveWizard = (wizardElem != null);
+  let wizardElem = getWizard();
+  let haveWizard = (wizardElem != null);
   if (haveWizard)
   {
+    // Relabel the accept button to be "Connect"
+    let okBtn = document.documentElement.getButton("accept");
+    if (okBtn)
+      okBtn.label = TorLauncherUtil.getLocalizedString("connect");
+
     // Set "Copy Tor Log" label and move it after the Quit (cancel) button.
-    var copyLogBtn = document.documentElement.getButton("extra2");
+    let copyLogBtn = document.documentElement.getButton("extra2");
     if (copyLogBtn)
     {
       copyLogBtn.label = wizardElem.getAttribute("buttonlabelextra2");
-      var cancelBtn = document.documentElement.getButton("cancel");
+      let cancelBtn = document.documentElement.getButton("cancel");
       if (cancelBtn && TorLauncherUtil.isMac)
         cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling);
     }
@@ -184,7 +190,7 @@ function initDialog()
     }
 
     // Use "Connect" as the finish button label (on the last wizard page).
-    var finishBtn = document.documentElement.getButton("finish");
+    let finishBtn = document.documentElement.getButton("finish");
     if (finishBtn)
     {
       finishBtn.label = TorLauncherUtil.getLocalizedString("connect");
@@ -200,12 +206,13 @@ function initDialog()
 
   initDefaultBridgeTypeMenu();
 
+  addObserver(kTorBootstrapStatusTopic);
   addObserver(kTorBootstrapErrorTopic);
   addObserver(kTorLogHasWarnOrErrTopic);
   addObserver(kTorProcessExitedTopic);
-  addObserver(kTorOpenProgressTopic);
+  addObserver(kTorShowProgressPanelTopic);
 
-  var status = gTorProcessService.TorProcessStatus;
+  let status = gTorProcessService.TorProcessStatus;
   if (TorLauncherUtil.shouldStartAndOwnTor &&
      (status != gTorProcessService.kStatusRunning))
   {
@@ -236,7 +243,7 @@ function initDialog()
 
 function initLocaleDialog()
 {
-  initDialogCommon(true);
+  initDialogCommon();
 
   // Replace the finish button's label ("Done") with the next button's
   // label ("Next" or "Continue").
@@ -395,6 +402,20 @@ function onWizardPageShow()
 }
 
 
+function isShowingProgress()
+{
+  let wizardElem = getWizard();
+  if (wizardElem)
+    return (kWizardProgressPageID == wizardElem.currentPage.pageid);
+
+  let deckElem = document.getElementById("deck");
+  if (deckElem)
+    return (kNetworkSettingsProgressPanelID == deckElem.selectedPanel.id);
+
+  return false;
+}
+
+
 function getWizard()
 {
   let elem = document.getElementById("TorNetworkSettings");
@@ -409,7 +430,7 @@ function onWizardFirstPanelConnect()
   // If the user configured bridge or proxy settings, prompt before
   // discarding their data.
   if (isBridgeConfigured() || isProxyConfigured())
-    showPanel("discardSettings");
+    showPanel(kWizardDiscardSettingsPageID);
   else
     removeSettingsAndConnect()
 }
@@ -418,7 +439,7 @@ function onWizardFirstPanelConnect()
 function removeSettingsAndConnect()
 {
   applySettings(true);  // Use default settings.
-  if (!gIsBootstrapComplete)
+  if (!gTorProcessService.TorIsBootstrapDone)
     readTorSettings();  // Ensure UI matches the settings that were used.
 }
 
@@ -450,6 +471,49 @@ function onBridgeTypeRadioChange()
 }
 
 
+function onDeckSelect()
+{
+  let deckElem = document.getElementById("deck");
+  if (kNetworkSettingsProgressPanelID == deckElem.id)
+    onShowProgressPanel();
+}
+
+
+function onShowProgressPanel()
+{
+  if (gTorProcessService.TorIsBootstrapDone)
+  {
+    close();
+    return;
+  }
+
+  // Set up navigation buttons.
+  // setTimeout() is needed because this panel may be shown first.
+  // Because resetProgressNavButtons() is called without delay, it may
+  // be called before this timer fires. Therefore we store a reference
+  // to it so that we can cancel it inside resetProgressNavButtons().
+  gShowProgressTimer = setTimeout(function() {
+      gShowProgressTimer = undefined;
+      showOrHideButton("cancel", false, false); // hide quit button
+      overrideButtonLabel("finish", gCancelLabelStr);
+  }, 0);
+}
+
+
+function resetProgressNavButtons()
+{
+  if (gShowProgressTimer)
+  {
+    clearTimeout(gShowProgressTimer);
+    gShowProgressTimer = undefined;
+  }
+
+  restoreButtonLabel("finish");
+  showOrHideButton("cancel", true, false);
+  return true;
+}
+
+
 var gObserver = {
   observe: function(aSubject, aTopic, aData)
   {
@@ -477,9 +541,13 @@ var gObserver = {
       removeObserver(kTorProcessExitedTopic);
       showErrorMessage(true, null, false);
     }
-    else if (kTorOpenProgressTopic == aTopic)
+    else if (kTorShowProgressPanelTopic == aTopic)
+    {
+      showProgressPanel();
+    }
+    else if (kTorBootstrapStatusTopic == aTopic)
     {
-      openProgressDialog();
+      updateBootstrapProgress(aSubject.wrappedJSObject);
     }
   }
 };
@@ -516,6 +584,44 @@ function removeAllObservers()
 }
 
 
+function updateBootstrapProgress(aStatusObj)
+{
+  if (!isShowingProgress())
+    return;
+
+  let labelText =
+            TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, "TAG");
+  let percentComplete = (aStatusObj.PROGRESS) ? aStatusObj.PROGRESS : 0;
+
+  let meter = document.getElementById("progressMeter");
+  if (meter)
+  {
+    meter.value = percentComplete;
+    showProgressMeterIfNoError();
+  }
+
+  if (percentComplete >= 100)
+  {
+    // To ensure that 100% progress is displayed, wait a short while before
+    // closing this window... but first, hide the cancel button to avoid a
+    // race where the user clicks Cancel when bootstrapping has already
+    // finished (and this window is scheduled to close in 250ms). Use CSS
+    // visibility=hidden instead of XUL hidden=true so that the "For
+    // Assistance" text does not move.
+    let btnID = getWizard() ? "finish" : "cancel";
+    let btn = document.documentElement.getButton(btnID);
+    if (btn)
+      btn.style.visibility = "hidden";
+    window.setTimeout(function() { close(); }, 250);
+    gIsWindowScheduledToClose = true;
+  }
+
+  let desc = document.getElementById("progressDesc");
+  if (labelText && desc)
+    desc.textContent = labelText;
+}
+
+
 function readTorSettings()
 {
   TorLauncherLogger.log(2, "readTorSettings " +
@@ -571,11 +677,21 @@ function showPanel(aPanelID)
 
   var deckElem = document.getElementById("deck");
   if (deckElem)
+  {
     deckElem.selectedPanel = document.getElementById(aPanelID);
+  }
   else if (wizard.currentPage.pageid != aPanelID)
+  {
+    if (kWizardProgressPageID == wizard.currentPage.pageid)
+      resetProgressNavButtons(); // goTo() does not generate pagehide events.
     wizard.goTo(aPanelID);
+  }
 
-  showOrHideButton("accept", (aPanelID == "settings"), true);
+  if (!wizard)
+  {
+    // Ensure that the OK button is only shown on the main settings panel.
+    showOrHideButton("accept", (aPanelID == "settings"), true);
+  }
 }
 
 
@@ -586,6 +702,12 @@ function advanceToWizardPanel(aPanelID)
   if (!wizard)
     return;
 
+  if (kWizardProgressPageID == aPanelID)
+  {
+    showProgressPanel();
+    return;
+  }
+
   onWizardConfigure(); // Equivalent to pressing "Configure"
 
   const kMaxTries = 10;
@@ -791,17 +913,24 @@ function showMenuListPlaceholderText(aElemID)
 }
 
 
-function overrideButtonLabel(aID, aLabelKey)
+function overrideButtonLabel(aID, aLabel)
 {
-  var btn = document.documentElement.getButton(aID);
+  let btn = document.documentElement.getButton(aID);
   if (btn)
   {
     btn.setAttribute("origLabel", btn.label);
-    btn.label = TorLauncherUtil.getLocalizedString(aLabelKey);
+    btn.label = aLabel;
   }
 }
 
 
+function overrideButtonLabelWithKey(aID, aLabelKey)
+{
+  let label = TorLauncherUtil.getLocalizedString(aLabelKey);
+  overrideButtonLabel(aID, label);
+}
+
+
 function restoreButtonLabel(aID)
 {
   var btn = document.documentElement.getButton(aID);
@@ -872,6 +1001,9 @@ function onWizardReconfig()
 
 function onCancel()
 {
+  if (gIsWindowScheduledToClose)
+    return false;     // Ignore cancel in this case.
+
   if (gRestoreAfterHelpPanelID) // Is help open?
   {
     closeHelp();
@@ -897,6 +1029,22 @@ function onCancel()
 }
 
 
+function onWizardFinish()
+{
+  if (isShowingProgress())
+  {
+    // When the progress panel is showing, the finish button is "Cancel"
+    stopTorBootstrap();
+    getWizard().rewind();
+    return false;
+  }
+  else
+  {
+    return applySettings(false);
+  }
+}
+
+
 function onNetworkSettingsFinish()
 {
   if (gRestoreAfterHelpPanelID) // Is help open?
@@ -942,7 +1090,7 @@ function onOpenHelp(aHelpContentID)
   if (gRestoreAfterHelpPanelID) // Already open?
     return;
 
-  var deckElem = document.getElementById("deck");
+  let deckElem = document.getElementById("deck");
   if (deckElem)
     gRestoreAfterHelpPanelID = deckElem.selectedPanel.id;
   else
@@ -960,15 +1108,15 @@ function onOpenHelp(aHelpContentID)
   {
     showOrHideButton("cancel", false, false);
     showOrHideButton("back", false, false);
-    overrideButtonLabel("next", "done");
+    overrideButtonLabelWithKey("next", "done");
     showOrHideButton("next", true, false);
-    var forAssistance = document.getElementById("forAssistance");
+    let forAssistance = document.getElementById("forAssistance");
     if (forAssistance)
       forAssistance.setAttribute("hidden", true);
   }
   else
   {
-    overrideButtonLabel("cancel", "done");
+    overrideButtonLabelWithKey("cancel", "done");
   }
 }
 
@@ -1217,25 +1365,20 @@ function useSettings()
   gProtocolSvc.TorSendCommand("SAVECONF");
   gTorProcessService.TorClearBootstrapError();
 
-  // If we are not responsible for starting tor we do not monitor bootstrap
-  // status, so just close this dialog and return rather than opening the
-  // progress dialog (which will make no progress).
-  if (!TorLauncherUtil.shouldStartAndOwnTor)
+  // If bootstrapping has finished or we are not responsible for starting
+  // tor, close this window and return (no need to show the progress bar).
+  if (gTorProcessService.TorIsBootstrapDone ||
+      !TorLauncherUtil.shouldStartAndOwnTor)
   {
     close();
     return;
   }
 
-  gIsBootstrapComplete = gTorProcessService.TorIsBootstrapDone;
-  if (!gIsBootstrapComplete)
-    openProgressDialog();
+  showProgressPanel();
 
+/* TODO2017: is this needed? Used to be after modal progress dlog was displayed
   let wizardElem = getWizard();
-  if (gIsBootstrapComplete)
-  {
-    close();
-  }
-  else if (wizardElem)
+  if (!gTorProcessService.TorIsBootstrapDone && wizardElem)
   {
     // If the user went down the "Configure" path and another error (e.g.,
     // Tor Exited) has not already been shown, display a generic message
@@ -1247,21 +1390,82 @@ function useSettings()
       showErrorMessage(false, msg, true);
     }
   }
+*/
+}
+
+
+function stopTorBootstrap()
+{
+  // Tell tor to disable use of the network; this should stop the bootstrap
+  // process.
+  const kErrorPrefix = "Setting DisableNetwork=1 failed: ";
+  try
+  {
+    let settings = {};
+    settings["DisableNetwork"] = true;
+    let errObj = {};
+    if (!gProtocolSvc.TorSetConfWithReply(settings, errObj))
+      TorLauncherLogger.log(5, kErrorPrefix + errObj.details);
+  }
+  catch(e)
+  {
+    TorLauncherLogger.log(5, kErrorPrefix + e);
+  }
 }
 
 
-function openProgressDialog()
+function showProgressPanel()
 {
-  var chromeURL = "chrome://torlauncher/content/progress.xul";
-  var features = "chrome,dialog=yes,modal=yes,dependent=yes";
-  window.openDialog(chromeURL, "_blank", features,
-                    gIsInitialBootstrap, onProgressDialogClose);
+  if (gIsInitialBootstrap)
+  {
+    let pleaseWait = document.getElementById("progressPleaseWait");
+    if (pleaseWait)
+      pleaseWait.removeAttribute("hidden");
+  }
+
+  // Clear the description to avoid displaying any old messages.
+  let desc = document.getElementById("progressDesc");
+  if (desc)
+    desc.textContent = "";
+
+  // To avoid showing an incorrect progress value, we hide the progress bar
+  // until the first TorBootstrapStatus notification is received.
+  let meter = document.getElementById("progressMeter");
+  if (meter)
+  {
+    meter.value = 0;
+    meter.style.visibility = "hidden";
+  }
+
+  // Show the correct wizard page or Network Settings panel.
+  let wizardElem = getWizard();
+  if (wizardElem)
+  {
+    if (kWizardDiscardSettingsPageID == wizardElem.currentPage.pageid)
+      showPanel();  // Remove discard settings page from the flow.
+
+    wizardElem.advance(kWizardProgressPageID);
+  }
+  else
+  {
+    showPanel(kNetworkSettingsProgressPanelID);
+  }
+
+  // Request the most recent bootstrap status info so that a
+  // TorBootstrapStatus notification is generated as soon as possible.
+  gProtocolSvc.TorRetrieveBootstrapStatus();
+
+  // Also start a fail-safe timer to ensure that the progress bar is displayed
+  // within 2 seconds in all cases.
+  window.setTimeout(function() { showProgressMeterIfNoError(); }, 2000);
 }
 
 
-function onProgressDialogClose(aBootstrapCompleted)
+function showProgressMeterIfNoError()
 {
-  gIsBootstrapComplete = aBootstrapCompleted;
+  let meter = document.getElementById("progressMeter");
+  if (meter && !gTorProcessService.TorBootstrapErrorOccurred)
+    meter.style.visibility = "visible";
 }
 
 
diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul
index e6d3531..1b5ced0 100644
--- a/src/chrome/content/network-settings.xul
+++ b/src/chrome/content/network-settings.xul
@@ -29,7 +29,7 @@
   <script type="application/x-javascript"
           src="chrome://torlauncher/content/network-settings.js"/>
 
-  <deck id="deck">
+  <deck id="deck" onselect="onDeckSelect();">
     <vbox id="settings">
       <vbox id="bridgeSettings"/>
       <separator orient="horizontal" class="thin"/>
@@ -51,6 +51,9 @@
       </hbox>
       <spring flex="1" />
     </vbox>
+    <vbox id="progressPanel">
+      <vbox id="progressContent"/>
+    </vbox>
     <vbox id="errorPanel">
       <spring flex="1" />
       <hbox>
diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js
deleted file mode 100644
index f7bcaff..0000000
--- a/src/chrome/content/progress.js
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright (c) 2017, The Tor Project, Inc.
-// See LICENSE for licensing information.
-//
-// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-const kTorProcessExitedTopic = "TorProcessExited";
-const kBootstrapStatusTopic = "TorBootstrapStatus";
-const kTorBootstrapErrorTopic = "TorBootstrapError";
-const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr";
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil",
-                          "resource://torlauncher/modules/tl-util.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger",
-                          "resource://torlauncher/modules/tl-logger.jsm");
-
-
-var gObsSvc;
-var gOpenerCallbackFunc; // Set when opened from network settings.
-
-
-function initDialog()
-{
-  // If tor bootstrap has already finished, just close the progress dialog.
-  // This situation can occur if bootstrapping is very fast and/or if this
-  // window opens slowly (observed with Adblock Plus installed).
-  try
-  {
-    var processSvc = Cc["@torproject.org/torlauncher-process-service;1"]
-                .getService(Ci.nsISupports).wrappedJSObject;
-    if (processSvc.TorIsBootstrapDone || processSvc.TorBootstrapErrorOccurred)
-    {
-      closeThisWindow(processSvc.TorIsBootstrapDone);
-      return;
-    }
-  }
-  catch (e) { dump(e + "\n"); }
-
-  try
-  {
-    gObsSvc = Cc["@mozilla.org/observer-service;1"]
-                  .getService(Ci.nsIObserverService);
-    gObsSvc.addObserver(gObserver, kTorProcessExitedTopic, false);
-    gObsSvc.addObserver(gObserver, kBootstrapStatusTopic, false);
-    gObsSvc.addObserver(gObserver, kTorBootstrapErrorTopic, false);
-    gObsSvc.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false);
-  }
-  catch (e) {}
-
-  var isBrowserStartup = false;
-  if (window.arguments)
-  {
-    isBrowserStartup = window.arguments[0];
-
-    if (window.arguments.length > 1)
-      gOpenerCallbackFunc = window.arguments[1];
-  }
-
-  if (gOpenerCallbackFunc)
-  {
-    // Dialog was opened from network settings: hide Open Settings button.
-    var extraBtn = document.documentElement.getButton("extra2");
-    extraBtn.setAttribute("hidden", true);
-  }
-  else
-  {
-    // Dialog was not opened from network settings: change Cancel to Quit.
-    var cancelBtn = document.documentElement.getButton("cancel");
-    var quitKey = (TorLauncherUtil.isWindows) ? "quit_win" : "quit";
-    cancelBtn.label = TorLauncherUtil.getLocalizedString(quitKey);
-  }
-
-  // If opened during browser startup, display the "please wait" message.
-  if (isBrowserStartup)
-  {
-    var pleaseWait = document.getElementById("progressPleaseWait");
-    if (pleaseWait)
-      pleaseWait.removeAttribute("hidden");
-  }
-
-  // To avoid showing an incorrect progress value, we keep the progress bar
-  // hidden until a TorBootstrapStatus notification is received. We request
-  // the most recent bootstrap status info (which should cause such a
-  // notification to be generated) and also start a fail-safe timer to ensure
-  // that the progress bar is displayed within 2 seconds in all cases.
-  let protocolSvc = Cc["@torproject.org/torlauncher-protocol-service;1"]
-                      .getService(Ci.nsISupports).wrappedJSObject;
-  protocolSvc.TorRetrieveBootstrapStatus();
-  window.setTimeout(function() { showProgressMeterIfNoError(); }, 2000);
-}
-
-
-function cleanup()
-{
-  if (gObsSvc)
-  {
-    gObsSvc.removeObserver(gObserver, kTorProcessExitedTopic);
-    gObsSvc.removeObserver(gObserver, kBootstrapStatusTopic);
-    gObsSvc.removeObserver(gObserver, kTorBootstrapErrorTopic);
-    gObsSvc.removeObserver(gObserver, kTorLogHasWarnOrErrTopic);
-  }
-}
-
-
-function closeThisWindow(aBootstrapDidComplete)
-{
-  cleanup();
-
-  if (gOpenerCallbackFunc)
-    gOpenerCallbackFunc(aBootstrapDidComplete);
-
-  window.close();
-}
-
-
-function onCancel()
-{
-  cleanup();
-
-  if (gOpenerCallbackFunc)
-  {
-    stopTorBootstrap();
-    gOpenerCallbackFunc(false);
-  }
-  else try
-  {
-    var obsSvc = Cc["@mozilla.org/observer-service;1"]
-                   .getService(Ci.nsIObserverService);
-    obsSvc.notifyObservers(null, "TorUserRequestedQuit", null);
-  } catch (e) {}
-
-  return true;
-}
-
-
-function onOpenSettings()
-{
-  stopTorBootstrap();
-  cleanup();
-  window.close();
-}
-
-
-function stopTorBootstrap()
-{
-  // Tell tor to disable use of the network; this should stop the bootstrap
-  // process.
-  const kErrorPrefix = "Setting DisableNetwork=1 failed: ";
-  try
-  {
-    var svc = Cc["@torproject.org/torlauncher-protocol-service;1"]
-                 .getService(Ci.nsISupports);
-    svc = svc.wrappedJSObject;
-    var settings = {};
-    settings["DisableNetwork"] = true;
-    var errObj = {};
-    if (!svc.TorSetConfWithReply(settings, errObj))
-      TorLauncherLogger.log(5, kErrorPrefix + errObj.details);
-  }
-  catch(e)
-  {
-    TorLauncherLogger.log(5, kErrorPrefix + e);
-  }
-}
-
-
-function showProgressMeterIfNoError()
-{
-  let meter = document.getElementById("progressMeter");
-  if (meter &&
-      !document.documentElement.hasAttribute("bootstrapErrorOccurred"))
-  {
-    meter.style.visibility = "visible";
-  }
-}
-
-
-var gObserver = {
-  // nsIObserver implementation.
-  observe: function(aSubject, aTopic, aParam)
-  {
-    if ((kTorProcessExitedTopic == aTopic) ||
-        (kTorBootstrapErrorTopic == aTopic))
-    {
-      // In these cases, an error alert will be displayed elsewhere so it is
-      // best to close this window.
-      // TODO: provide a way to access tor log e.g., leave this dialog open
-      //       and display the open settings button or provide a way to do
-      //       that from our error alerts.
-      if (kTorBootstrapErrorTopic == aTopic)
-        stopTorBootstrap();
-      cleanup();
-      window.close();
-    }
-    else if (kBootstrapStatusTopic == aTopic)
-    {
-      var statusObj = aSubject.wrappedJSObject;
-      var labelText =
-                TorLauncherUtil.getLocalizedBootstrapStatus(statusObj, "TAG");
-      var percentComplete = (statusObj.PROGRESS) ? statusObj.PROGRESS : 0;
-
-      var meter = document.getElementById("progressMeter");
-      if (meter)
-      {
-        meter.value = percentComplete;
-        showProgressMeterIfNoError();
-      }
-
-      var bootstrapDidComplete = (percentComplete >= 100);
-      if (percentComplete >= 100)
-      {
-        // To ensure that 100% progress is displayed, wait a short while
-        // before closing this window.
-        window.setTimeout(function() { closeThisWindow(true); }, 250);
-      }
-      else if (statusObj._errorOccurred)
-      {
-        var s = TorLauncherUtil.getLocalizedBootstrapStatus(statusObj, "REASON");
-        if (s)
-          labelText = s;
-
-        document.documentElement.setAttribute("bootstrapErrorOccurred", true);
-
-        if (meter)
-          meter.setAttribute("hidden", true);
-
-        var pleaseWait = document.getElementById("progressPleaseWait");
-        if (pleaseWait)
-          pleaseWait.setAttribute("hidden", true);
-      }
-
-      var desc = document.getElementById("progressDesc");
-      if (labelText && desc)
-        desc.textContent = labelText;
-    }
-    else if (kTorLogHasWarnOrErrTopic == aTopic)
-    {
-      var extra2Btn = document.documentElement.getButton("extra2");
-      var clz = extra2Btn.getAttribute("class");
-      extra2Btn.setAttribute("class", clz ? clz + " torWarning" : "torWarning");
-
-      // TODO: show error / warning message in this dialog?
-    }
-  },
-};
diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul
deleted file mode 100644
index 5b26110..0000000
--- a/src/chrome/content/progress.xul
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   - Copyright (c) 2017, The Tor Project, Inc.
-   - See LICENSE for licensing information.
-   - vim: set sw=2 sts=2 ts=8 et syntax=xml:
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
-<?xml-stylesheet href="chrome://torlauncher/skin/progress.css"
-                 type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://torlauncher/locale/progress.dtd">
-
-<dialog id="TorProgress"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-        title="&torprogress.dialog.title;"
-        windowtype="TorLauncher:Progress"
-        persist="screenX screenY"
-        buttons="cancel,extra2"
-        buttonlabelextra2="&torprogress.openSettings;"
-        ondialogcancel="return onCancel();"
-        ondialogextra2="onOpenSettings();"
-        onload="initDialog();">
-
-    <script type="application/x-javascript"
-            src="chrome://torlauncher/content/progress.js"/>
-  <vbox>
-    <hbox>
-      <vbox>
-        <spacer flex="1" />
-        <image id="tbb-icon" />
-        <spacer flex="1" />
-      </vbox>
-      <separator orient="vertical" />
-      <vbox flex="1">
-        <label id="progressHeading" value="&torprogress.heading;" />
-        <description id="progressDesc" />
-      </vbox>
-    </hbox>
-    <progressmeter id="progressMeter" mode="determined" value="0"
-                   style="visibility:hidden" />
-    <description id="progressPleaseWait"
-                 hidden="true">&torprogress.pleaseWait;</description>
-  </vbox>
-</dialog>
diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ach/network-settings.dtd
+++ b/src/chrome/locale/ach/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ach/progress.dtd b/src/chrome/locale/ach/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ach/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ady/network-settings.dtd
+++ b/src/chrome/locale/ady/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ady/progress.dtd b/src/chrome/locale/ady/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ady/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/af-ZA/network-settings.dtd b/src/chrome/locale/af-ZA/network-settings.dtd
new file mode 100644
index 0000000..3cab152
--- /dev/null
+++ b/src/chrome/locale/af-ZA/network-settings.dtd
@@ -0,0 +1,3 @@
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/af-ZA/progress.dtd b/src/chrome/locale/af-ZA/progress.dtd
deleted file mode 100644
index ebd9cef..0000000
--- a/src/chrome/locale/af-ZA/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd
index d226ca3..ff231bb 100644
--- a/src/chrome/locale/af/network-settings.dtd
+++ b/src/chrome/locale/af/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/af/progress.dtd b/src/chrome/locale/af/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/af/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ak/network-settings.dtd
+++ b/src/chrome/locale/ak/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ak/progress.dtd b/src/chrome/locale/ak/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ak/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd
index 23aae0a..003e255 100644
--- a/src/chrome/locale/am-ET/network-settings.dtd
+++ b/src/chrome/locale/am-ET/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/am-ET/progress.dtd b/src/chrome/locale/am-ET/progress.dtd
deleted file mode 100644
index 8ce4f0e..0000000
--- a/src/chrome/locale/am-ET/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "á?¨á?¶á?­ á?­á??á?³">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd
index 2e81470..b6d2e03 100644
--- a/src/chrome/locale/am/network-settings.dtd
+++ b/src/chrome/locale/am/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/am/progress.dtd b/src/chrome/locale/am/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/am/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index a20acd8..cd31eed 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net اÙ? https://mail.google.com, اÙ? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Ù?Ù? Ø®Ù?اÙ? Ù?Ù?تب اÙ?Ù?ساعدة">
 <!ENTITY torsettings.bridgeHelp4 "Ù?Ù?Ù?Ù?Ù? Ø·Ù?ب عÙ?اÙ?Ù?Ù? اÙ?جسرØ? Ù?Ø­Ù? أخÙ?رØ? Ù?Ù? Ø®Ù?اÙ? إرساÙ? رساÙ?Ø© برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? Ù?Ù?ذبة Ø¥Ù?Ù? help@xxxxxxxxxxxxxxxxx.&#160; Ù?رجÙ? Ù?Ù?احظة Ø£Ù?Ù? Ù?جب Ø£Ù? Ù?رد شخص Ù?ا عÙ?Ù? Ù?Ù? Ø·Ù?ب.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "اÙ?رجاء اÙ?اÙ?تظار حتÙ? Ù?تÙ?Ù?Ù? Ù?Ù? تÙ?عÙ?Ù? اتصاÙ? اÙ?Ù? شبÙ?Ù? &quot;تÙ?ر&quot; .&#160; Ù?د Ù?ستغرÙ? اÙ?اÙ?ر عدÙ? دÙ?ائÙ?.">
diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd
deleted file mode 100644
index 90ac171..0000000
--- a/src/chrome/locale/ar/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "حاÙ?Ø© تÙ?ر">
-<!ENTITY torprogress.openSettings "اÙ?تح اÙ?إعدادات">
-<!ENTITY torprogress.heading "جارÙ? اÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر">
-<!ENTITY torprogress.pleaseWait "اÙ?رجاء اÙ?اÙ?تظار حتÙ? Ù?تÙ?Ù?Ù? Ù?Ù? تÙ?عÙ?Ù? اتصاÙ? اÙ?Ù? شبÙ?Ù? &quot;تÙ?ر&quot; .&#160; Ù?د Ù?ستغرÙ? اÙ?اÙ?ر عدÙ? دÙ?ائÙ?.">
diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/arn/network-settings.dtd
+++ b/src/chrome/locale/arn/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/arn/progress.dtd b/src/chrome/locale/arn/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/arn/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd
index 6f12432..e85cb26 100644
--- a/src/chrome/locale/ast/network-settings.dtd
+++ b/src/chrome/locale/ast/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ast/progress.dtd b/src/chrome/locale/ast/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ast/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd
index 9e96619..7ef8cd1 100644
--- a/src/chrome/locale/az/network-settings.dtd
+++ b/src/chrome/locale/az/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, vÉ? ya https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "DÉ?stÉ?k Masası VasitÉ?silÉ?">
 <!ENTITY torsettings.bridgeHelp4 "Son çarÉ? olaraq körpü ünvanlarını help@xxxxxxxxxxxxxxxxx ünvanına mÉ?dÉ?ni tÉ?lÉ?b emaili göndÉ?rmÉ?klÉ? É?ldÉ? edÉ? bilÉ?rsÉ?n.&#160; LütfÉ?n, unutma ki, yazdıÄ?ın insan hÉ?r bir tÉ?lÉ?bÉ? ayrı ayrı cavab yazacaq.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/az/progress.dtd b/src/chrome/locale/az/progress.dtd
deleted file mode 100644
index 31e6b48..0000000
--- a/src/chrome/locale/az/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Statusu">
-<!ENTITY torprogress.openSettings "ParametrlÉ?ri aç">
-<!ENTITY torprogress.heading "Tor Å?É?bÉ?kÉ?sinÉ? qoÅ?ulur">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd
index 9e0d430..c235b1c 100644
--- a/src/chrome/locale/be/network-settings.dtd
+++ b/src/chrome/locale/be/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/be/progress.dtd b/src/chrome/locale/be/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/be/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bg-BG/network-settings.dtd b/src/chrome/locale/bg-BG/network-settings.dtd
new file mode 100644
index 0000000..3cab152
--- /dev/null
+++ b/src/chrome/locale/bg-BG/network-settings.dtd
@@ -0,0 +1,3 @@
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/bg-BG/progress.dtd b/src/chrome/locale/bg-BG/progress.dtd
deleted file mode 100644
index ebd9cef..0000000
--- a/src/chrome/locale/bg-BG/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd
index 7972c72..ce13b61 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Ð?Ñ?ез бÑ?Ñ?оÑ?о за помоÑ?">
 <!ENTITY torsettings.bridgeHelp4 "Ð?аÑ?о поÑ?ледна Ñ?Ñ?Ñ?пка, вие може да изиÑ?кваÑ?е адÑ?еÑ?и Ñ?Ñ?ез пÑ?аÑ?ане на Ñ?Ñ?Ñ?ив имейл до help@xxxxxxxxxxxxxxxxx.&#160; Ð?олÑ? обÑ?Ñ?неÑ?е внимание, Ñ?е на вÑ?Ñ?ка молба за bridge Ñ?е оÑ?говаÑ?Ñ? пеÑ?Ñ?онално.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Ð?олÑ? изÑ?акайÑ?е, докаÑ?о Ñ?Ñ?Ñ?ановим вÑ?Ñ?зка Ñ? ТоÑ? мÑ?ежаÑ?а..&#160; Toва може да оÑ?неме нÑ?колко минÑ?Ñ?и.">
diff --git a/src/chrome/locale/bg/progress.dtd b/src/chrome/locale/bg/progress.dtd
deleted file mode 100644
index 490a9d5..0000000
--- a/src/chrome/locale/bg/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "СÑ?Ñ?Ñ?оÑ?ние на ТоÑ?">
-<!ENTITY torprogress.openSettings "Ð?Ñ?воÑ?и наÑ?Ñ?Ñ?ойки">
-<!ENTITY torprogress.heading "СвÑ?Ñ?зване Ñ? ТоÑ? мÑ?ежаÑ?а">
-<!ENTITY torprogress.pleaseWait "Ð?олÑ? изÑ?акайÑ?е, докаÑ?о Ñ?Ñ?Ñ?ановим вÑ?Ñ?зка Ñ? ТоÑ? мÑ?ежаÑ?а..&#160; Toва може да оÑ?неме нÑ?колко минÑ?Ñ?и.">
diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/bn-BD/network-settings.dtd
+++ b/src/chrome/locale/bn-BD/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bn-BD/progress.dtd b/src/chrome/locale/bn-BD/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/bn-BD/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/bn-IN/network-settings.dtd
+++ b/src/chrome/locale/bn-IN/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bn-IN/progress.dtd b/src/chrome/locale/bn-IN/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/bn-IN/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd
index 5ebd2d0..db4e635 100644
--- a/src/chrome/locale/bn/network-settings.dtd
+++ b/src/chrome/locale/bn/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bn/progress.dtd b/src/chrome/locale/bn/progress.dtd
deleted file mode 100644
index 9819d83..0000000
--- a/src/chrome/locale/bn/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "�র �বস�থা">
-<!ENTITY torprogress.openSettings "স��ি�স ��ল�ন">
-<!ENTITY torprogress.heading "�র ন���য়ার���র সাথ� স�য���ত হ����">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/bo/network-settings.dtd
+++ b/src/chrome/locale/bo/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bo/progress.dtd b/src/chrome/locale/bo/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/bo/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/br/network-settings.dtd
+++ b/src/chrome/locale/br/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/br/progress.dtd b/src/chrome/locale/br/progress.dtd
deleted file mode 100644
index b5790df..0000000
--- a/src/chrome/locale/br/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Statudoù Tor">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd
index 5a33a60..2a7e408 100644
--- a/src/chrome/locale/bs/network-settings.dtd
+++ b/src/chrome/locale/bs/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/bs/progress.dtd b/src/chrome/locale/bs/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/bs/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd
index bff8120..9eb7945 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -74,3 +74,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "A través de l'Escriptori d'Ajuda">
 <!ENTITY torsettings.bridgeHelp4 "Com a última opció, podeu demanar adreces de pont enviant un missatge a help@xxxxxxxxxxxxxxxxx.&#160; Una persona respondrà cada petició.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.&#160; Això pot tardar uns minuts.">
diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd
deleted file mode 100644
index cb1bd5d..0000000
--- a/src/chrome/locale/ca/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Estat de Tor">
-<!ENTITY torprogress.openSettings "Obrie les preferències.">
-<!ENTITY torprogress.heading "S'està connectant a la xarxa Tor">
-<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.&#160; Això pot tardar uns minuts.">
diff --git a/src/chrome/locale/ca@valencia/network-settings.dtd b/src/chrome/locale/ca@valencia/network-settings.dtd
index 0458e75..e666423 100644
--- a/src/chrome/locale/ca@valencia/network-settings.dtd
+++ b/src/chrome/locale/ca@valencia/network-settings.dtd
@@ -52,3 +52,6 @@
 <!ENTITY torsettings.bridgeHelp2 "">
 <!ENTITY torsettings.bridgeHelp3 "">
 <!ENTITY torsettings.bridgeHelp4 "">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "">
diff --git a/src/chrome/locale/ca@valencia/progress.dtd b/src/chrome/locale/ca@valencia/progress.dtd
deleted file mode 100644
index e0dcfcc..0000000
--- a/src/chrome/locale/ca@valencia/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "">
-<!ENTITY torprogress.openSettings "">
-<!ENTITY torprogress.heading "">
-<!ENTITY torprogress.pleaseWait "">
diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd
index 75ece3b..9c78c3c 100644
--- a/src/chrome/locale/cs-CZ/network-settings.dtd
+++ b/src/chrome/locale/cs-CZ/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cs-CZ/progress.dtd b/src/chrome/locale/cs-CZ/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/cs-CZ/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index a69caff..d5241e1 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, nebo https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "PÅ?es zákaznickou linku">
 <!ENTITY torsettings.bridgeHelp4 "Jako poslední Å?eÅ¡ení si můžete vyžádat adresy síťových mostů tak, že zaÅ¡lete sluÅ¡ný e-mail na help@xxxxxxxxxxxxxxxxx.&#160; VezmÄ?te v úvahu si prosím, že na každý požadavek musí odpovÄ?dÄ?t Ä?lovÄ?k.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Prosím Ä?ekejte zatímco se pÅ?ipojuji do Tor sítÄ?.&#160; Toto může trvat nÄ?kolik minut.">
diff --git a/src/chrome/locale/cs/progress.dtd b/src/chrome/locale/cs/progress.dtd
deleted file mode 100644
index 0311994..0000000
--- a/src/chrome/locale/cs/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Stav">
-<!ENTITY torprogress.openSettings "OtevÅ?ít nastavení">
-<!ENTITY torprogress.heading "PÅ?ipojuji se k síti Tor">
-<!ENTITY torprogress.pleaseWait "Prosím Ä?ekejte zatímco se pÅ?ipojuji do Tor sítÄ?.&#160; Toto může trvat nÄ?kolik minut.">
diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/csb/network-settings.dtd
+++ b/src/chrome/locale/csb/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/csb/progress.dtd b/src/chrome/locale/csb/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/csb/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd
index dfe657e..6a95899 100644
--- a/src/chrome/locale/cv/network-settings.dtd
+++ b/src/chrome/locale/cv/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cv/progress.dtd b/src/chrome/locale/cv/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/cv/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd
index 6f3cc56..2ed3e89 100644
--- a/src/chrome/locale/cy/network-settings.dtd
+++ b/src/chrome/locale/cy/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/cy/progress.dtd b/src/chrome/locale/cy/progress.dtd
deleted file mode 100644
index c4f29d7..0000000
--- a/src/chrome/locale/cy/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Statws Tor">
-<!ENTITY torprogress.openSettings "Agor Gosodiadau">
-<!ENTITY torprogress.heading "Yn cysylltu â rhwydwaith Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index 2851032..4257722 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig e-mail to help@xxxxxxxxxxxxxxxxx.&#160; Bemærk venligst at alle e-mails besvares manuelt.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.&#160; Det kan tage flere minutter.">
diff --git a/src/chrome/locale/da/progress.dtd b/src/chrome/locale/da/progress.dtd
deleted file mode 100644
index 063ad85..0000000
--- a/src/chrome/locale/da/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor status">
-<!ENTITY torprogress.openSettings "Ã?bn indstillinger">
-<!ENTITY torprogress.heading "Opretter forbindelse til Tor-netværket">
-<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.&#160; Det kan tage flere minutter.">
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index c635745..d976ea2 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, oder https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle">
 <!ENTITY torsettings.bridgeHelp4 "Brückenadressen können auch mit Hilfe einer höflichen E-Mail an help@xxxxxxxxxxxxxxxxx angefordert werden.&#160; Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.&#160; Das kann einige Minuten dauern.">
diff --git a/src/chrome/locale/de/progress.dtd b/src/chrome/locale/de/progress.dtd
deleted file mode 100644
index b3b893a..0000000
--- a/src/chrome/locale/de/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor-Status">
-<!ENTITY torprogress.openSettings "Einstellungen öffnen">
-<!ENTITY torprogress.heading "Verbindung mit dem Tor-Netzwerk wird hergestellt">
-<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.&#160; Das kann einige Minuten dauern.">
diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/dz/network-settings.dtd
+++ b/src/chrome/locale/dz/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/dz/progress.dtd b/src/chrome/locale/dz/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/dz/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/el-GR/network-settings.dtd b/src/chrome/locale/el-GR/network-settings.dtd
new file mode 100644
index 0000000..3cab152
--- /dev/null
+++ b/src/chrome/locale/el-GR/network-settings.dtd
@@ -0,0 +1,3 @@
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/el-GR/progress.dtd b/src/chrome/locale/el-GR/progress.dtd
deleted file mode 100644
index ebd9cef..0000000
--- a/src/chrome/locale/el-GR/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index aa2b6f4..85d7b78 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -74,3 +74,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Î?έÏ?Ï? Ï?ηÏ? Î¥Ï?οÏ?Ï?ήÏ?ιξηÏ?">
 <!ENTITY torsettings.bridgeHelp4 "Î?ν Ï?λα Ï?α άλλα αÏ?οÏ?Ï?Ï?οÏ?ν, μÏ?οÏ?είÏ?ε να ζηÏ?ήÏ?εÏ?ε διεÏ?θÏ?νÏ?ειÏ? γεÏ?Ï?Ï?Ï?ν Ï?Ï?έλνονÏ?αÏ? ένα εÏ?γενικÏ? email Ï?Ï?ο help@xxxxxxxxxxxxxxxxx.&#160; ΣημείÏ?Ï?η: Î?άÏ?οιοÏ? εθελονÏ?ήÏ? θα Ï?Ï?έÏ?ει να αÏ?ανÏ?ήÏ?ει Ï?ειÏ?οκίνηÏ?α (Ï?Ï?νεÏ?Ï?Ï? η αÏ?άνÏ?ηÏ?η ίÏ?Ï?Ï? αÏ?γήÏ?ει).">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "ΠαÏ?ακαλÏ? Ï?εÏ?ιμένεÏ?ε καθÏ?Ï? δημιοÏ?Ï?γήÏ?Ï?ε Ï?Ï?νδεÏ?η Ï?Ï?ο δίκÏ?Ï?ο Tor.&#160; Î?Ï?Ï?Ï? μÏ?οÏ?εί να Ï?άÏ?ει μεÏ?ικά λεÏ?Ï?ά.">
diff --git a/src/chrome/locale/el/progress.dtd b/src/chrome/locale/el/progress.dtd
deleted file mode 100644
index e63961a..0000000
--- a/src/chrome/locale/el/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Î?αÏ?άÏ?Ï?αÏ?η Ï?οÏ? Tor ">
-<!ENTITY torprogress.openSettings "Î?νοιγμα Ï?Ï?θμιÏ?εÏ?ν">
-<!ENTITY torprogress.heading "Î?ημιοÏ?Ï?για Ï?Ï?νδεÏ?ηÏ? Ï?Ï?ο δίκÏ?Ï?ο Tor">
-<!ENTITY torprogress.pleaseWait "ΠαÏ?ακαλÏ? Ï?εÏ?ιμένεÏ?ε καθÏ?Ï? δημιοÏ?Ï?γήÏ?Ï?ε Ï?Ï?νδεÏ?η Ï?Ï?ο δίκÏ?Ï?ο Tor.&#160; Î?Ï?Ï?Ï? μÏ?οÏ?εί να Ï?άÏ?ει μεÏ?ικά λεÏ?Ï?ά.">
diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/en-GB/network-settings.dtd
+++ b/src/chrome/locale/en-GB/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/en-GB/progress.dtd b/src/chrome/locale/en-GB/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/en-GB/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd
index dc666dd..240154c 100644
--- a/src/chrome/locale/en/network-settings.dtd
+++ b/src/chrome/locale/en/network-settings.dtd
@@ -53,3 +53,6 @@
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.&#160; Each type of bridge uses a different method to avoid censorship.&#160; The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
 <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.&#160; If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/en/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd
index 0c3fa75..f6d763a 100644
--- a/src/chrome/locale/eo/network-settings.dtd
+++ b/src/chrome/locale/eo/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/eo/progress.dtd b/src/chrome/locale/eo/progress.dtd
deleted file mode 100644
index c03f16a..0000000
--- a/src/chrome/locale/eo/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Stato de Tor">
-<!ENTITY torprogress.openSettings "Malfermi agordojn">
-<!ENTITY torprogress.heading "Konektante al Tor-reto">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index 49e95dd..5be6fa5 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.&#160;  Puede tardar varios minutos.">
diff --git a/src/chrome/locale/es-AR/progress.dtd b/src/chrome/locale/es-AR/progress.dtd
deleted file mode 100644
index 223d4a5..0000000
--- a/src/chrome/locale/es-AR/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Estado de Tor">
-<!ENTITY torprogress.openSettings "Abrir Configuraciones">
-<!ENTITY torprogress.heading "Conectando a la red Tor">
-<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.&#160;  Puede tardar varios minutos.">
diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd
index 6303509..30d3940 100644
--- a/src/chrome/locale/es-CL/network-settings.dtd
+++ b/src/chrome/locale/es-CL/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-CL/progress.dtd b/src/chrome/locale/es-CL/progress.dtd
deleted file mode 100644
index 87e2523..0000000
--- a/src/chrome/locale/es-CL/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Estado Del Modulo Tor">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Conectando a la red Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd
index cb4c106..4a458a0 100644
--- a/src/chrome/locale/es-CO/network-settings.dtd
+++ b/src/chrome/locale/es-CO/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-CO/progress.dtd b/src/chrome/locale/es-CO/progress.dtd
deleted file mode 100644
index f59998a..0000000
--- a/src/chrome/locale/es-CO/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Estado de Tor">
-<!ENTITY torprogress.openSettings "Configuraciones abiertas">
-<!ENTITY torprogress.heading "Conectando a la red de Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd
index ad001f4..85b97c0 100644
--- a/src/chrome/locale/es-MX/network-settings.dtd
+++ b/src/chrome/locale/es-MX/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.&#160; Esto puede llevar varios minutos.">
diff --git a/src/chrome/locale/es-MX/progress.dtd b/src/chrome/locale/es-MX/progress.dtd
deleted file mode 100644
index 3ee4849..0000000
--- a/src/chrome/locale/es-MX/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Estado de Tor">
-<!ENTITY torprogress.openSettings "Abrir Ajustes">
-<!ENTITY torprogress.heading "Conectando a la red Tor">
-<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.&#160; Esto puede llevar varios minutos.">
diff --git a/src/chrome/locale/es-NI/network-settings.dtd b/src/chrome/locale/es-NI/network-settings.dtd
new file mode 100644
index 0000000..3cab152
--- /dev/null
+++ b/src/chrome/locale/es-NI/network-settings.dtd
@@ -0,0 +1,3 @@
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/es-NI/progress.dtd b/src/chrome/locale/es-NI/progress.dtd
deleted file mode 100644
index ebd9cef..0000000
--- a/src/chrome/locale/es-NI/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index dc01bb3..45ff7f0 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -74,3 +74,6 @@
 <!ENTITY torsettings.bridgeHelp4Heading "Mediante el soporte de usuario">
 <!ENTITY torsettings.bridgeHelp4 "Como último recurso, puedes pedir direcciones de repetidores puente enviando un mensaje de correo amable a help@xxxxxxxxxxxxxxxxx .&#160;
 Por favor ten en cuenta que es una persona la que tendrá que responder a cada petición.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Por favor, espere a que establezcamos una conexión a la red Tor.&#160; Esto puede llevar varios minutos.">
diff --git a/src/chrome/locale/es/progress.dtd b/src/chrome/locale/es/progress.dtd
deleted file mode 100644
index a8703de..0000000
--- a/src/chrome/locale/es/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Estado de Tor">
-<!ENTITY torprogress.openSettings "Abrir Preferencias">
-<!ENTITY torprogress.heading "Conectando con la red de Tor">
-<!ENTITY torprogress.pleaseWait "Por favor, espere a que establezcamos una conexión a la red Tor.&#160; Esto puede llevar varios minutos.">
diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd
index c4bdb10..35b5fe3 100644
--- a/src/chrome/locale/et/network-settings.dtd
+++ b/src/chrome/locale/et/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/et/progress.dtd b/src/chrome/locale/et/progress.dtd
deleted file mode 100644
index 6b93dff..0000000
--- a/src/chrome/locale/et/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tori staatus">
-<!ENTITY torprogress.openSettings "Ava seaded">
-<!ENTITY torprogress.heading "Tor võrgustikuga ühendumine">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd
index 0efb96c..9753df9 100644
--- a/src/chrome/locale/eu/network-settings.dtd
+++ b/src/chrome/locale/eu/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez">
 <!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help@xxxxxxxxxxxxxxxxx-era bidaliz.&#160; Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.&#160; Honek minutu batzuk har litzake.">
diff --git a/src/chrome/locale/eu/progress.dtd b/src/chrome/locale/eu/progress.dtd
deleted file mode 100644
index 55bb4c0..0000000
--- a/src/chrome/locale/eu/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor egoera">
-<!ENTITY torprogress.openSettings "Ezarpenak ireki">
-<!ENTITY torprogress.heading "Tor sarera konektatzen">
-<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.&#160; Honek minutu batzuk har litzake.">
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index 490a77b..76cb386 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -74,3 +74,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, Û?ا https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "از طرÛ?Ù? Ù?احد Ú©Ù?Ú© رساÙ?Û?">
 <!ENTITY torsettings.bridgeHelp4 "اگر از طرÛ?Ù? Ù?Û?Ú? کداÙ? از راÙ? Ø­Ù? Ù?اÛ? Ù?Ù?Ù? بÙ? Ù?تÛ?جÙ? Ù?رسÛ?دÛ?دØ? Û?Ú© درخÙ?است Ù?Ù?دباÙ?Ù? بÙ? آدرس help@xxxxxxxxxxxxxxxxx ارساÙ? Ú©Ù?Û?د.&#160; در Ù?ظر داشتÙ? باشÛ?د Ú©Ù? Û?Ú© Ù?Ù?ر باÛ?د اÛ?Ù?Û?Ù? Ø´Ù?ا را بخÙ?اÙ?د Ù? بÙ? Ø¢Ù? پاسخ دÙ?د. پس صبÙ?ر باشÛ?د.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Ù?Ø·Ù?ا صبر Ú©Ù?Û?د. در حاÙ? برÙ?رارÛ? ارتباط با شبکÙ? تÙ?ر.&amp;160; اÛ?Ù? پرÙ?سÙ? Ù?Ù?Ú©Ù? است Ú?Ù?د دÙ?Û?Ù?Ù? بÙ? Ø·Ù?Ù? بÛ?Ù?جاÙ?د.">
diff --git a/src/chrome/locale/fa/progress.dtd b/src/chrome/locale/fa/progress.dtd
deleted file mode 100644
index 8646caa..0000000
--- a/src/chrome/locale/fa/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Ù?ضعÛ?ت تÙ?ر">
-<!ENTITY torprogress.openSettings "تÙ?ظÛ?Ù?اتâ??را باز Ú©Ù?Û?د">
-<!ENTITY torprogress.heading "درحاÙ? اتصاÙ? بÙ? شبکÙ? تÙ?ر">
-<!ENTITY torprogress.pleaseWait "Ù?Ø·Ù?ا صبر Ú©Ù?Û?د. در حاÙ? برÙ?رارÛ? ارتباط با شبکÙ? تÙ?ر.&amp;160; اÛ?Ù? پرÙ?سÙ? Ù?Ù?Ú©Ù? است Ú?Ù?د دÙ?Û?Ù?Ù? بÙ? Ø·Ù?Ù? بÛ?Ù?جاÙ?د.">
diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd
index f0ddb4c..bbd6db8 100644
--- a/src/chrome/locale/fi/network-settings.dtd
+++ b/src/chrome/locale/fi/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com tai https:://mail.yahoo.com">
 <!ENTITY torsettings.bridgeHelp4Heading "Neuvontapisteen läpi">
 <!ENTITY torsettings.bridgeHelp4 "Viimeisenä keinona voit pyytää siltaosoitteita lähettämällä kohteliaan viestin osoitteeseen: help@xxxxxxxxxxxxxxxxx.&#160; Huomioi, että henkilön tulee vastata kuhunkin pyyntöön.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.&#160;
diff --git a/src/chrome/locale/fi/progress.dtd b/src/chrome/locale/fi/progress.dtd
deleted file mode 100644
index 69414cf..0000000
--- a/src/chrome/locale/fi/progress.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor-tila">
-<!ENTITY torprogress.openSettings "Avaa asetukset">
-<!ENTITY torprogress.heading "Yhdistetään Tor-verkkoon">
-<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.&#160;
-Tässä saattaa kestää muutama minuutti.">
diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd
index bd9412b..b73700b 100644
--- a/src/chrome/locale/fil/network-settings.dtd
+++ b/src/chrome/locale/fil/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.&#160; Maari itong tumagal ng ilang minuto.">
diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd
deleted file mode 100644
index c73883b..0000000
--- a/src/chrome/locale/fil/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Buksan ang Settings">
-<!ENTITY torprogress.heading "Nakikipag-ugnayan sa network ng Tor.">
-<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.&#160; Maari itong tumagal ng ilang minuto.">
diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd
index 78bc505..bf6c933 100644
--- a/src/chrome/locale/fo/network-settings.dtd
+++ b/src/chrome/locale/fo/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fo/progress.dtd b/src/chrome/locale/fo/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/fo/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd
index d117b0d..af3ea91 100644
--- a/src/chrome/locale/fr-CA/network-settings.dtd
+++ b/src/chrome/locale/fr-CA/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance">
 <!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help@xxxxxxxxxxxxxxxxx.&#160; Veuillez remarquer qu'une personne devra répondre à chaque demande.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.&#160; Cela pourrait prendre plusieurs minutes.">
diff --git a/src/chrome/locale/fr-CA/progress.dtd b/src/chrome/locale/fr-CA/progress.dtd
deleted file mode 100644
index 39a0643..0000000
--- a/src/chrome/locale/fr-CA/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Ã?tat de Tor">
-<!ENTITY torprogress.openSettings "Ouvrir les paramètres">
-<!ENTITY torprogress.heading "Connexion au réseau Tor">
-<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.&#160; Cela pourrait prendre plusieurs minutes.">
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index d795967..5cdbd06 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance">
 <!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help@xxxxxxxxxxxxxxxxx.&#160; Veuillez remarquer qu'une personne devra répondre à chaque demande.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.&#160; Cela pourrait prendre plusieurs minutes.">
diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd
deleted file mode 100644
index 39a0643..0000000
--- a/src/chrome/locale/fr/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Ã?tat de Tor">
-<!ENTITY torprogress.openSettings "Ouvrir les paramètres">
-<!ENTITY torprogress.heading "Connexion au réseau Tor">
-<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.&#160; Cela pourrait prendre plusieurs minutes.">
diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/fur/network-settings.dtd
+++ b/src/chrome/locale/fur/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fur/progress.dtd b/src/chrome/locale/fur/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/fur/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd
index 477705a..1753adb 100644
--- a/src/chrome/locale/fy/network-settings.dtd
+++ b/src/chrome/locale/fy/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/fy/progress.dtd b/src/chrome/locale/fy/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/fy/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ga/network-settings.dtd
+++ b/src/chrome/locale/ga/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ga/progress.dtd b/src/chrome/locale/ga/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ga/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd
index 7940a38..20c000f 100644
--- a/src/chrome/locale/gl/network-settings.dtd
+++ b/src/chrome/locale/gl/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gl/progress.dtd b/src/chrome/locale/gl/progress.dtd
deleted file mode 100644
index 84c3935..0000000
--- a/src/chrome/locale/gl/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Estado do Tor">
-<!ENTITY torprogress.openSettings "Abrir axustes">
-<!ENTITY torprogress.heading "Conexión á rede Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/gu-IN/network-settings.dtd
+++ b/src/chrome/locale/gu-IN/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gu-IN/progress.dtd b/src/chrome/locale/gu-IN/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/gu-IN/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd
index b66952c..d5bf712 100644
--- a/src/chrome/locale/gu/network-settings.dtd
+++ b/src/chrome/locale/gu/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gu/progress.dtd b/src/chrome/locale/gu/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/gu/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/gun/network-settings.dtd
+++ b/src/chrome/locale/gun/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/gun/progress.dtd b/src/chrome/locale/gun/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/gun/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ha/network-settings.dtd
+++ b/src/chrome/locale/ha/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ha/progress.dtd b/src/chrome/locale/ha/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ha/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd
index d6a09c7..cf3887c 100644
--- a/src/chrome/locale/he/network-settings.dtd
+++ b/src/chrome/locale/he/network-settings.dtd
@@ -77,3 +77,6 @@ https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4 "×?×?×?צ×? ×?×?ר×?×?, ת×?×?×? ×?×?קש רש×?×?ת ×?שר×?×? ×?×?×?צע×?ת פנ×?×?×? ×?× ×?×?סת ×?×?×?×?×? ×?×?ת×?×?ת ×?×?×?×?: 
 help@xxxxxxxxxxxxxxxxx
 ×?× ×? ×?×?×?ר ש×?×? ×?× ×?ש ×?×?×?×?×¥ ×?×?ש×?×? ×?×?×?פ×? ×?×?ש×? ×?×?×? ×?קש×? ש×?×?×?.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/he/progress.dtd b/src/chrome/locale/he/progress.dtd
deleted file mode 100644
index ee4943a..0000000
--- a/src/chrome/locale/he/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "×?צ×? Tor">
-<!ENTITY torprogress.openSettings "פת×? ×?×?×?ר×?ת">
-<!ENTITY torprogress.heading "×?ת×?×?ר ×?עת ×?×? רשת Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd
index 3b7b724..61a87d4 100644
--- a/src/chrome/locale/hi/network-settings.dtd
+++ b/src/chrome/locale/hi/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "��� द�र र��ि�। हम ��र �� स��ाल स� ��� रह� ह��। ��� मिन� ल� स�त� ह��।">
diff --git a/src/chrome/locale/hi/progress.dtd b/src/chrome/locale/hi/progress.dtd
deleted file mode 100644
index 03eacb2..0000000
--- a/src/chrome/locale/hi/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "��र �ा �वस�था। ">
-<!ENTITY torprogress.openSettings "स��ि���स ��ल��। ">
-<!ENTITY torprogress.heading "��र स��ाल स� ��� ह�। ">
-<!ENTITY torprogress.pleaseWait "��� द�र र��ि�। हम ��र �� स��ाल स� ��� रह� ह��। ��� मिन� ल� स�त� ह��।">
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
index 0e4d96a..2834a8b 100644
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ b/src/chrome/locale/hr-HR/network-settings.dtd
@@ -75,3 +75,6 @@ s Tor mrežom?">
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ili https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "PomoÄ?u Help Deska">
 <!ENTITY torsettings.bridgeHelp4 "Na kraju, možete zatražiti adrese mostova tako Å¡to Ä?e te poslati pristojan email na help@xxxxxxxxxxxxxxxxx.&#160; Imajte na umu da Ä?e na svaki zahtjev morati odgovoriti osoba.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Molimo priÄ?ekajte dok ne uspostavimo vezu s Tor mrežom.&#160; To bi moglo potrajati nekoliko minuta.">
diff --git a/src/chrome/locale/hr-HR/progress.dtd b/src/chrome/locale/hr-HR/progress.dtd
deleted file mode 100644
index 20fa443..0000000
--- a/src/chrome/locale/hr-HR/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Otvori postavke">
-<!ENTITY torprogress.heading "Spajanje na Tor mrežu">
-<!ENTITY torprogress.pleaseWait "Molimo priÄ?ekajte dok ne uspostavimo vezu s Tor mrežom.&#160; To bi moglo potrajati nekoliko minuta.">
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index 874dda9..0ba50d8 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Molimo priÄ?ekajte dok uspostavljamo vezu sa Tor mrežom. &#160; Ovo može potrajati nekoliko minuta.">
diff --git a/src/chrome/locale/hr/progress.dtd b/src/chrome/locale/hr/progress.dtd
deleted file mode 100644
index da8dda4..0000000
--- a/src/chrome/locale/hr/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Status Tor-a">
-<!ENTITY torprogress.openSettings "Otvori Postavke">
-<!ENTITY torprogress.heading "Spajanje na Tor mrežu">
-<!ENTITY torprogress.pleaseWait "Molimo priÄ?ekajte dok uspostavljamo vezu sa Tor mrežom. &#160; Ovo može potrajati nekoliko minuta.">
diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ht/network-settings.dtd
+++ b/src/chrome/locale/ht/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ht/progress.dtd b/src/chrome/locale/ht/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ht/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd
index e8fc42e..b52082e 100644
--- a/src/chrome/locale/hu/network-settings.dtd
+++ b/src/chrome/locale/hu/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, vagy https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "A támogatáson keresztül.">
 <!ENTITY torsettings.bridgeHelp4 "Utolsó lehetÅ?ségként küldj egy udvarias bridge igénylÅ? emailt ide: help@xxxxxxxxxxxxxxxxx.&#160; Légyszíves vedd figyelembe az adott személynek több emailt kell megválaszolnia.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.&#160; Ez eltarthat néhány percig.">
diff --git a/src/chrome/locale/hu/progress.dtd b/src/chrome/locale/hu/progress.dtd
deleted file mode 100644
index e4565a2..0000000
--- a/src/chrome/locale/hu/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor állapot">
-<!ENTITY torprogress.openSettings "Beállítások megnyitása">
-<!ENTITY torprogress.heading "Kapcsolódás a Tor hálózathoz">
-<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.&#160; Ez eltarthat néhány percig.">
diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd
index f6b89c5..84a2881 100644
--- a/src/chrome/locale/hy-AM/network-settings.dtd
+++ b/src/chrome/locale/hy-AM/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hy-AM/progress.dtd b/src/chrome/locale/hy-AM/progress.dtd
deleted file mode 100644
index 545668d..0000000
--- a/src/chrome/locale/hy-AM/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor-Õ« Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯Õ¨">
-<!ENTITY torprogress.openSettings "Ô²Õ¡Ö?Õ¥Õ¬ Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨">
-<!ENTITY torprogress.heading "Õ?Õ«Õ¡Ö?Õ¸Ö?Õ´ Tor Ö?Õ¡Õ¶Ö?Õ«Õ¶">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd
index 213562d..e952b09 100644
--- a/src/chrome/locale/hy/network-settings.dtd
+++ b/src/chrome/locale/hy/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/hy/progress.dtd b/src/chrome/locale/hy/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/hy/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd
index b9bd75e..58a9c71 100644
--- a/src/chrome/locale/ia/network-settings.dtd
+++ b/src/chrome/locale/ia/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ia/progress.dtd b/src/chrome/locale/ia/progress.dtd
deleted file mode 100644
index 3f9c00f..0000000
--- a/src/chrome/locale/ia/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Stato de Tor">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index c5815c6..3fbef36 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Melalui Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Sebagai pilihan terakhir anda dapat meminta alamat bridge dengan mengirimkan pesan email dengan sopan ke help@xxxxxxxxxxxxxxxxx.&#160; Silakan catat bahwa petugas akan merespon masing-masing permintaan">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Mohon tunggu sementara kami menyambung ke jaringan Tor.&#160; Ini mungkin memakan waktu beberapa menit.">
diff --git a/src/chrome/locale/id/progress.dtd b/src/chrome/locale/id/progress.dtd
deleted file mode 100644
index da6956f..0000000
--- a/src/chrome/locale/id/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Status Tor">
-<!ENTITY torprogress.openSettings "Buka Pengaturan">
-<!ENTITY torprogress.heading "Menyambung ke jaringan Tor">
-<!ENTITY torprogress.pleaseWait "Mohon tunggu sementara kami menyambung ke jaringan Tor.&#160; Ini mungkin memakan waktu beberapa menit.">
diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd
index 1e294fd..28e8ddb 100644
--- a/src/chrome/locale/is/network-settings.dtd
+++ b/src/chrome/locale/is/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "� gegnum hjálparborðið">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.&#160; �að getur tekið nokkrar mínútur.">
diff --git a/src/chrome/locale/is/progress.dtd b/src/chrome/locale/is/progress.dtd
deleted file mode 100644
index 4cc7f46..0000000
--- a/src/chrome/locale/is/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Staða Tor">
-<!ENTITY torprogress.openSettings "Opna stillingar">
-<!ENTITY torprogress.heading "Tengist Tor-netinu">
-<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.&#160; �að getur tekið nokkrar mínútur.">
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index b7a4411..943e24c 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Attraverso l'Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Come ultima spiaggia, puoi richiedere un indirizzo bridge mandando una cortese mail a help@xxxxxxxxxxxxxxxxx.&#160; Tieni conto che una persona dovrà rispondere ad ogni singola richiesta.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.&#160; Potrebbero essere necessari alcuni minuti.">
diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd
deleted file mode 100644
index e60f306..0000000
--- a/src/chrome/locale/it/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Stato di Tor">
-<!ENTITY torprogress.openSettings "Apertura impostazioni">
-<!ENTITY torprogress.heading "Connessione in corso alla rete Tor">
-<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.&#160; Potrebbero essere necessari alcuni minuti.">
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 724a4ee..16fee49 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "ã??ã?«ã??ã??ã?¹ã?¯çµ?ç?±">
 <!ENTITY torsettings.bridgeHelp4 "æ??å¾?ã?®é ¼ã?¿ã?®ç¶±ã?¨ã??ã?¦ã?? help@xxxxxxxxxxxxxxxxx ã?«ä¸?寧ã?ªã?¡ã?¼ã?«ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã?¦ã??ã??ã?ªã??ã?¸ã?¢ã??ã?¬ã?¹ã??ã?ªã?¯ã?¨ã?¹ã??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??&#160; 人é??ã??å??ã?ªã?¯ã?¨ã?¹ã??ã?«å¯¾å¿?ã??ã??å¿?è¦?ã??ã??ã??ã??ã?¨ã?«ã??注æ??ã??ã? ã??ã??ã??">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Torã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??確ç«?ã??ã??ã??ã?¾ã?§ã??å¾?ã?¡ã??ã? ã??ã??ã??&#160; ã??ã??ã?«ã?¯æ?°å??é??ã??ã??ã??ã??ã?¨ã??ã??ã??ã?¾ã??ã??">
diff --git a/src/chrome/locale/ja/progress.dtd b/src/chrome/locale/ja/progress.dtd
deleted file mode 100644
index db3ec29..0000000
--- a/src/chrome/locale/ja/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Torã?®ç?¶æ??">
-<!ENTITY torprogress.openSettings "設å®?ã??é??ã??">
-<!ENTITY torprogress.heading "Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??">
-<!ENTITY torprogress.pleaseWait "Torã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??確ç«?ã??ã??ã??ã?¾ã?§ã??å¾?ã?¡ã??ã? ã??ã??ã??&#160; ã??ã??ã?«ã?¯æ?°å??é??ã??ã??ã??ã??ã?¨ã??ã??ã??ã?¾ã??ã??">
diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/jv/network-settings.dtd
+++ b/src/chrome/locale/jv/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/jv/progress.dtd b/src/chrome/locale/jv/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/jv/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index d75f96d..236b7ea 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ka/progress.dtd b/src/chrome/locale/ka/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ka/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd
index 478fe43..3787679 100644
--- a/src/chrome/locale/kk/network-settings.dtd
+++ b/src/chrome/locale/kk/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kk/progress.dtd b/src/chrome/locale/kk/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/kk/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd
index c58339f..0d10dbc 100644
--- a/src/chrome/locale/km/network-settings.dtd
+++ b/src/chrome/locale/km/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "á??á?¶á??á??á??á??â??á??á??á??á?½á??â??">
 <!ENTITY torsettings.bridgeHelp4 "á??á??â??á??á??á??á??á?¾á??â??á??á?»á??á??á??á??á??á?? á?¢á??á??á??â??á?¢á?¶á??â??á??á??á??á?¾â??â??á?¢á?¶á??á??á??á??á??á?¶á??â??á??á??á??á??á?¸á??â??á??á??á??â??á??á??á??á?¾â??á??á?¶á??â??á?¢á??á?¸á??á??á??â??á??á?½á??á??á??â??á??á?? help@xxxxxxxxxxxxxxxxx.&#160; á??á?¼á??â??á??á??á??á?¶á??â??á??á?¶ á??á??á?»á??á??á??â??â??á??á??á??á?¶á??á??â??á??á?¹á??â??á??á??á??á?¼á??â??á??á??á??á?¾á??á??á??â??á??á??â??á??á??á??á?¾â??á??á?¸á??á?½á??á??á??">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/km/progress.dtd b/src/chrome/locale/km/progress.dtd
deleted file mode 100644
index 76d75ce..0000000
--- a/src/chrome/locale/km/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "á??á??á??á?¶á??á??á?¶á?? Tor">
-<!ENTITY torprogress.openSettings "á??á?¾á??â??á??á?¶á??â??á??á??á??á??á??">
-<!ENTITY torprogress.heading "á??á??á??á?¶á??á??â??á??á??â??á??á??á??á??á?¶á?? Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd
index e18a7cc..2a9f2c7 100644
--- a/src/chrome/locale/kn/network-settings.dtd
+++ b/src/chrome/locale/kn/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kn/progress.dtd b/src/chrome/locale/kn/progress.dtd
deleted file mode 100644
index b6e3b70..0000000
--- a/src/chrome/locale/kn/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "à²?ಾರà³?â??ನ ಸà³?ಥಿತಿ">
-<!ENTITY torprogress.openSettings "à²?ಪà³?ರà³?ಣ ಸà³?à²?à³?à²?ಿà²?à²?à³?â??à²?ಳà³?">
-<!ENTITY torprogress.heading "�ಾರ� �ಾಲ���� ಸ�ರಿ��ತಾ �ದ�ವಿ.">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd
index e6e9760..0908a1d 100644
--- a/src/chrome/locale/ko-KR/network-settings.dtd
+++ b/src/chrome/locale/ko-KR/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ko-KR/progress.dtd b/src/chrome/locale/ko-KR/progress.dtd
deleted file mode 100644
index 7c2da43..0000000
--- a/src/chrome/locale/ko-KR/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Tor ë?¤í?¸ì??í?¬ë¡? ì?°ê²°í??ê³  ì??ì?´ì??">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index 8599b02..64e87cb 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ë??ë?? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "í?¬í?? ë?°ì?¤í?¬ë¥¼ í?µí?´">
 <!ENTITY torsettings.bridgeHelp4 "ìµ?í??ì?? ì??ë?¨ì?¼ë¡? help@xxxxxxxxxxxxxxxxxì?? ì ?ì¤?í?? ë©?ì?¼ ë©?ì??ì§?를 ë³´ë?´ ë¸?릿ì§? 주ì??를 ì??ì²­í?  ì?? ì??ì?µë??ë?¤.&#160; ì?¬ë??ì?´ ê°? ì??ì²­ì?? ë??ì??í?  í??ì??ê°? ì??ë?¤ë?? ì ?ì?? 주ì?? í?´ì£¼ì?­ì??ì?¤">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²°í?  ë??ê¹?ì§? 기ë?¤ë ¤ì£¼ì?­ì??ì?¤.&#160; ëª? ë¶? ì ?ë?? ì??ì??ë?  ì?? ì??ì?µë??ë?¤.">
diff --git a/src/chrome/locale/ko/progress.dtd b/src/chrome/locale/ko/progress.dtd
deleted file mode 100644
index 6963c4f..0000000
--- a/src/chrome/locale/ko/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor ì??í??">
-<!ENTITY torprogress.openSettings "ì??ì?? ì?¤ì ?">
-<!ENTITY torprogress.heading "Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²°ì¤?">
-<!ENTITY torprogress.pleaseWait "Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²°í?  ë??ê¹?ì§? 기ë?¤ë ¤ì£¼ì?­ì??ì?¤.&#160; ëª? ë¶? ì ?ë?? ì??ì??ë?  ì?? ì??ì?µë??ë?¤.">
diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ku/network-settings.dtd
+++ b/src/chrome/locale/ku/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ku/progress.dtd b/src/chrome/locale/ku/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ku/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/kw/network-settings.dtd
+++ b/src/chrome/locale/kw/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/kw/progress.dtd b/src/chrome/locale/kw/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/kw/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd
index 74be4e1..a94a6ac 100644
--- a/src/chrome/locale/ky/network-settings.dtd
+++ b/src/chrome/locale/ky/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ky/progress.dtd b/src/chrome/locale/ky/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ky/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd
index 9e4060c..77fa7af 100644
--- a/src/chrome/locale/lb/network-settings.dtd
+++ b/src/chrome/locale/lb/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lb/progress.dtd b/src/chrome/locale/lb/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/lb/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/lg/network-settings.dtd
+++ b/src/chrome/locale/lg/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lg/progress.dtd b/src/chrome/locale/lg/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/lg/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ln/network-settings.dtd
+++ b/src/chrome/locale/ln/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ln/progress.dtd b/src/chrome/locale/ln/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ln/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd
index f0fdd8f..31cb0e6 100644
--- a/src/chrome/locale/lo/network-settings.dtd
+++ b/src/chrome/locale/lo/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "�ະລຸ�າລ���າ���ະ�ະ�ີ��ວ��ຮົາ�ັ�����າ���ື�ອມ�����ົ�າ��ືອ��າ� Tor.&#160; ອາ��ະ����ວລາຫລາ��າ�ີ.">
diff --git a/src/chrome/locale/lo/progress.dtd b/src/chrome/locale/lo/progress.dtd
deleted file mode 100644
index 14b98fe..0000000
--- a/src/chrome/locale/lo/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "ສະ�າ�ະ Tor">
-<!ENTITY torprogress.openSettings "���າ��ັ����າ">
-<!ENTITY torprogress.heading "�ຳລັ���ື�ອມ�����ົ�າ�ັ���ືອ��າ� Tor">
-<!ENTITY torprogress.pleaseWait "�ະລຸ�າລ���າ���ະ�ະ�ີ��ວ��ຮົາ�ັ�����າ���ື�ອມ�����ົ�າ��ືອ��າ� Tor.&#160; ອາ��ະ����ວລາຫລາ��າ�ີ.">
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index 0da969f..ecf78f0 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ar https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Prašome palaukti, kol mes užmegsime ryšį su Tor tinklu.&#160; Tai gali užtrukti kelias minutes.">
diff --git a/src/chrome/locale/lt/progress.dtd b/src/chrome/locale/lt/progress.dtd
deleted file mode 100644
index 0989f9f..0000000
--- a/src/chrome/locale/lt/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor būsena">
-<!ENTITY torprogress.openSettings "Atverti nustatymus">
-<!ENTITY torprogress.heading "Jungiamasi prie Tor tinklo">
-<!ENTITY torprogress.pleaseWait "Prašome palaukti, kol mes užmegsime ryšį su Tor tinklu.&#160; Tai gali užtrukti kelias minutes.">
diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd
index aeb6381..d10497d 100644
--- a/src/chrome/locale/lv/network-settings.dtd
+++ b/src/chrome/locale/lv/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru">
 <!ENTITY torsettings.bridgeHelp4 "PÄ?dÄ?jÄ?s instances palÄ«dzÄ«ba tiltu adreÅ¡u pieprasÄ«jumiem ir sÅ«tÄ«t pieklÄ?jÄ«gu e-pasta adresi uz help@xxxxxxxxxxxxxxxxx.&#160; LÅ«dzu, Å?emiet vÄ?rÄ?, ka ikvienu pieprasÄ«jumu izskata cilvÄ?ks.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "LÅ«dzu pagaidiet kamÄ?r mÄ?s izveidojam savienojumu ar tÄ«klu Tor.&#160; tam var bÅ«t nepiecieÅ¡amas vairÄ?kas minÅ«tes.">
diff --git a/src/chrome/locale/lv/progress.dtd b/src/chrome/locale/lv/progress.dtd
deleted file mode 100644
index 98f8be5..0000000
--- a/src/chrome/locale/lv/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor'a statuss">
-<!ENTITY torprogress.openSettings "AtvÄ?rt iestatÄ«jumus">
-<!ENTITY torprogress.heading "Veido savienojumu ar Tor'a tīklu">
-<!ENTITY torprogress.pleaseWait "LÅ«dzu pagaidiet kamÄ?r mÄ?s izveidojam savienojumu ar tÄ«klu Tor.&#160; tam var bÅ«t nepiecieÅ¡amas vairÄ?kas minÅ«tes.">
diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/mg/network-settings.dtd
+++ b/src/chrome/locale/mg/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mg/progress.dtd b/src/chrome/locale/mg/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/mg/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/mi/network-settings.dtd
+++ b/src/chrome/locale/mi/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mi/progress.dtd b/src/chrome/locale/mi/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/mi/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index 1f69d4f..00d6235 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mk/progress.dtd b/src/chrome/locale/mk/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/mk/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ml/progress.dtd b/src/chrome/locale/ml/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ml/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/mn/network-settings.dtd
+++ b/src/chrome/locale/mn/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mn/progress.dtd b/src/chrome/locale/mn/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/mn/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd
index ede666b..b0fef6d 100644
--- a/src/chrome/locale/mr/network-settings.dtd
+++ b/src/chrome/locale/mr/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mr/progress.dtd b/src/chrome/locale/mr/progress.dtd
deleted file mode 100644
index e37501b..0000000
--- a/src/chrome/locale/mr/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "��र स�थित�">
-<!ENTITY torprogress.openSettings "स��ि���स ��डा">
-<!ENTITY torprogress.heading "��र �ाळ�याला ��डण� �रण� �ाल� �ह�">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd
index 237f08d..71a3a6e 100644
--- a/src/chrome/locale/ms-MY/network-settings.dtd
+++ b/src/chrome/locale/ms-MY/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ms-MY/progress.dtd b/src/chrome/locale/ms-MY/progress.dtd
deleted file mode 100644
index 1735116..0000000
--- a/src/chrome/locale/ms-MY/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Buka tetapan.">
-<!ENTITY torprogress.heading "Menyambung ke rangkaian Tor.">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/mt/network-settings.dtd
+++ b/src/chrome/locale/mt/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/mt/progress.dtd b/src/chrome/locale/mt/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/mt/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd
index 8f58545..80448c5 100644
--- a/src/chrome/locale/my/network-settings.dtd
+++ b/src/chrome/locale/my/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/my/progress.dtd b/src/chrome/locale/my/progress.dtd
deleted file mode 100644
index 97fdfb1..0000000
--- a/src/chrome/locale/my/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor á?¡á??á?±á?¡á??á?¬á?¸">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Tor á??á?½á??á?ºá??á??á?ºá??á?­á?¯ á??á??á?ºá??á?½á??á?ºá??á?±á??á??á?º">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/nah/network-settings.dtd
+++ b/src/chrome/locale/nah/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nah/progress.dtd b/src/chrome/locale/nah/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/nah/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/nap/network-settings.dtd
+++ b/src/chrome/locale/nap/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nap/progress.dtd b/src/chrome/locale/nap/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/nap/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd
index 56f41f1..06e1054 100644
--- a/src/chrome/locale/nb/network-settings.dtd
+++ b/src/chrome/locale/nb/network-settings.dtd
@@ -74,3 +74,6 @@
 <!ENTITY torsettings.bridgeHelp4Heading "Via supporten">
 <!ENTITY torsettings.bridgeHelp4 "Som en siste utvei, kan du be om bro-adresser ved å sende en høflig e-post til help@xxxxxxxxxxxxxxxxx.&#160; 
 Tenk over at en person må svare på hver slik forespørsel.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.&#160; opprettes. Dette kan ta flere minutter.">
diff --git a/src/chrome/locale/nb/progress.dtd b/src/chrome/locale/nb/progress.dtd
deleted file mode 100644
index 82cf290..0000000
--- a/src/chrome/locale/nb/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor-status">
-<!ENTITY torprogress.openSettings "Ã?pne Innstillinger">
-<!ENTITY torprogress.heading "Kobler til Tor-nettverket">
-<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.&#160; opprettes. Dette kan ta flere minutter.">
diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/nds/network-settings.dtd
+++ b/src/chrome/locale/nds/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nds/progress.dtd b/src/chrome/locale/nds/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/nds/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd
index 57eb5f2..9b1f1a7 100644
--- a/src/chrome/locale/ne/network-settings.dtd
+++ b/src/chrome/locale/ne/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ne/progress.dtd b/src/chrome/locale/ne/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ne/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd
index 1c932a4..d313b6e 100644
--- a/src/chrome/locale/nl-BE/network-settings.dtd
+++ b/src/chrome/locale/nl-BE/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Via de Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nl-BE/progress.dtd b/src/chrome/locale/nl-BE/progress.dtd
deleted file mode 100644
index 9d01a14..0000000
--- a/src/chrome/locale/nl-BE/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Instellingen">
-<!ENTITY torprogress.heading "Connecteren naar het Tor netwerk">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index d7fa414..bb0bbe8 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Door middel van de helpdesk">
 <!ENTITY torsettings.bridgeHelp4 "Als laatste redmiddel kan je bridge-adressen aanvragen door een vriendelijke e-mail te sturen naar help@xxxxxxxxxxxxxxxxx.&#160; Houd er wel rekening mee dat deze persoon elke aanvraag moet behandelen.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.&#160;
diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd
deleted file mode 100644
index a7ced45..0000000
--- a/src/chrome/locale/nl/progress.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Instellingen">
-<!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk">
-<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.&#160;
-Dit kan enkele minuten duren.">
diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd
index 3b23940..f631124 100644
--- a/src/chrome/locale/nn/network-settings.dtd
+++ b/src/chrome/locale/nn/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nn/progress.dtd b/src/chrome/locale/nn/progress.dtd
deleted file mode 100644
index 0664105..0000000
--- a/src/chrome/locale/nn/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor-status">
-<!ENTITY torprogress.openSettings "Opne innstillingar">
-<!ENTITY torprogress.heading "Koplar til Tor-nettverket">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/nso/network-settings.dtd
+++ b/src/chrome/locale/nso/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/nso/progress.dtd b/src/chrome/locale/nso/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/nso/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/oc/network-settings.dtd
+++ b/src/chrome/locale/oc/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/oc/progress.dtd b/src/chrome/locale/oc/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/oc/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/or/network-settings.dtd
+++ b/src/chrome/locale/or/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/or/progress.dtd b/src/chrome/locale/or/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/or/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd
index b02946f..32da454 100644
--- a/src/chrome/locale/pa/network-settings.dtd
+++ b/src/chrome/locale/pa/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "ਮੱਦਦ ਡ�ਸ� ਰਾਹ��">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pa/progress.dtd b/src/chrome/locale/pa/progress.dtd
deleted file mode 100644
index ec821bc..0000000
--- a/src/chrome/locale/pa/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "��ਰ ਸਥਿਤ�">
-<!ENTITY torprogress.openSettings "ਸ��ਿੰ� ��ਲ�ਹ�">
-<!ENTITY torprogress.heading "��ਰ ਨ�ੱ�ਵਰ� ਨਾਲ ��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/pap/network-settings.dtd
+++ b/src/chrome/locale/pap/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pap/progress.dtd b/src/chrome/locale/pap/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/pap/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd
index 9a2f3f6..de9ccac 100644
--- a/src/chrome/locale/pl-PL/network-settings.dtd
+++ b/src/chrome/locale/pl-PL/network-settings.dtd
@@ -53,3 +53,6 @@
 <!ENTITY torsettings.bridgeHelp2 "">
 <!ENTITY torsettings.bridgeHelp3 "">
 <!ENTITY torsettings.bridgeHelp4 "">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "PrzeglÄ?darka Tor uruchomi siÄ? po poÅ?Ä?czeniu z sieciÄ? Tor">
diff --git a/src/chrome/locale/pl-PL/progress.dtd b/src/chrome/locale/pl-PL/progress.dtd
deleted file mode 100644
index 6edceb2..0000000
--- a/src/chrome/locale/pl-PL/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Status sieci Tor">
-<!ENTITY torprogress.openSettings "Ustawienia">
-<!ENTITY torprogress.heading "Å?Ä?czenie z sieciÄ? Tor">
-<!ENTITY torprogress.pleaseWait "PrzeglÄ?darka Tor uruchomi siÄ? po poÅ?Ä?czeniu z sieciÄ? Tor">
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index 18b1a48..cfb082d 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, lub https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Przez Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "W ostatecznoÅ?ci, można zażÄ?daÄ? adresów mostów, wysyÅ?ajÄ?c uprzejmÄ? wiadomoÅ?Ä? e-mail do help@xxxxxxxxxxxxxxxxx.&#160;  Należy pamiÄ?taÄ?, że osoba bÄ?dzie musiaÅ?a odpowiedzieÄ? na każde żÄ?danie.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "ProszÄ? zaczekaÄ?, aż ustanowimy poÅ?Ä?czenie do sieci Tor.&#160; To może zajÄ?Ä? kilka minut.">
diff --git a/src/chrome/locale/pl/progress.dtd b/src/chrome/locale/pl/progress.dtd
deleted file mode 100644
index 6896d3c..0000000
--- a/src/chrome/locale/pl/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Status sieci Tor">
-<!ENTITY torprogress.openSettings "Ustawienia">
-<!ENTITY torprogress.heading "Å?Ä?czenie z sieciÄ? Tor">
-<!ENTITY torprogress.pleaseWait "ProszÄ? zaczekaÄ?, aż ustanowimy poÅ?Ä?czenie do sieci Tor.&#160; To może zajÄ?Ä? kilka minut.">
diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/pms/network-settings.dtd
+++ b/src/chrome/locale/pms/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pms/progress.dtd b/src/chrome/locale/pms/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/pms/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ps/network-settings.dtd
+++ b/src/chrome/locale/ps/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ps/progress.dtd b/src/chrome/locale/ps/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ps/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd
index f7cf95b..7bbaedc 100644
--- a/src/chrome/locale/pt-BR/network-settings.dtd
+++ b/src/chrome/locale/pt-BR/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Pelo Serviço de Assistência">
 <!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode solicitar endereços de pontes enviando uma mensagem de e-mail educada para help@xxxxxxxxxxxxxxxxx.&#160; Por favor, entenda que uma pessoa terá que responder a cada solicitação">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.&#160; Isso pode demorar alguns minutos.">
diff --git a/src/chrome/locale/pt-BR/progress.dtd b/src/chrome/locale/pt-BR/progress.dtd
deleted file mode 100644
index 1c07b36..0000000
--- a/src/chrome/locale/pt-BR/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Status do Tor">
-<!ENTITY torprogress.openSettings "Abrir Configurações ">
-<!ENTITY torprogress.heading "Conectando à rede Tor">
-<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.&#160; Isso pode demorar alguns minutos.">
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index 5c0ae5c..4250124 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte">
 <!ENTITY torsettings.bridgeHelp4 "Em último caso, pode solicitar os endereços de ponte, enviando uma mensagem elegante para help@xxxxxxxxxxxxxxxxx.&#160; Por favor, note que uma pessoa irá precisar de responder a cada pedido.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.&#160;  Isto pode demorar alguns minutos.">
diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd
deleted file mode 100644
index f3a6922..0000000
--- a/src/chrome/locale/pt/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Estado do Tor">
-<!ENTITY torprogress.openSettings "Abrir Configurações">
-<!ENTITY torprogress.heading "A conetar à rede Tor">
-<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.&#160;  Isto pode demorar alguns minutos.">
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index d5f561a..c99dc80 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, sau https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Ca o ultimÄ? soluÈ?ie, puteÈ?i cere adrese de punÈ?i trimiÈ?înd un email politicos la help@xxxxxxxxxxxxxxxxx.&#160; RemarcaÈ?i cÄ? o persoanÄ? trebuie sÄ? rÄ?spundÄ? la fiecare cerere.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "VÄ? rugÄ?m aÈ?teptaÈ?i în timp ce stabilim o conexiune la reÈ?eaua Tor.&#160; Acest proces poate dura câteva minute.">
diff --git a/src/chrome/locale/ro/progress.dtd b/src/chrome/locale/ro/progress.dtd
deleted file mode 100644
index 9efa695..0000000
--- a/src/chrome/locale/ro/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Stare Tor">
-<!ENTITY torprogress.openSettings "SetÄ?ri">
-<!ENTITY torprogress.heading "Conctare la reţeaua Tor">
-<!ENTITY torprogress.pleaseWait "VÄ? rugÄ?m aÈ?teptaÈ?i în timp ce stabilim o conexiune la reÈ?eaua Tor.&#160; Acest proces poate dura câteva minute.">
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index ed79f3c..20117a1 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Ð? Ñ?пÑ?авоÑ?ной Ñ?лÑ?жбе">
 <!ENTITY torsettings.bridgeHelp4 "Ð? кÑ?айнем Ñ?лÑ?Ñ?ае, Ð?Ñ? можеÑ?е вежливо попÑ?оÑ?иÑ?Ñ? адÑ?еÑ?а моÑ?Ñ?ов по адÑ?еÑ?Ñ? help@xxxxxxxxxxxxxxxxx.&#160; Ð?ожалÑ?йÑ?Ñ?а, имейÑ?е в видÑ?, Ñ?Ñ?о каждÑ?й запÑ?оÑ? обÑ?абаÑ?Ñ?ваеÑ?Ñ?Ñ? Ñ?еловеком.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Ð?одождиÑ?е, пока мÑ? Ñ?Ñ?Ñ?ановим подклÑ?Ñ?ение к Ñ?еÑ?и Tor.&#160; ЭÑ?о можеÑ? занÑ?Ñ?Ñ? неÑ?колÑ?ко минÑ?Ñ?.">
diff --git a/src/chrome/locale/ru/progress.dtd b/src/chrome/locale/ru/progress.dtd
deleted file mode 100644
index 29b58f8..0000000
--- a/src/chrome/locale/ru/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "СÑ?аÑ?Ñ?Ñ? Tor">
-<!ENTITY torprogress.openSettings "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? наÑ?Ñ?Ñ?ойки">
-<!ENTITY torprogress.heading "Ð?одклÑ?Ñ?ение к Ñ?еÑ?и Tor">
-<!ENTITY torprogress.pleaseWait "Ð?одождиÑ?е, пока мÑ? Ñ?Ñ?Ñ?ановим подклÑ?Ñ?ение к Ñ?еÑ?и Tor.&#160; ЭÑ?о можеÑ? занÑ?Ñ?Ñ? неÑ?колÑ?ко минÑ?Ñ?.">
diff --git a/src/chrome/locale/ru@petr1708/network-settings.dtd b/src/chrome/locale/ru@petr1708/network-settings.dtd
index 5eae3c6..adaa33f 100644
--- a/src/chrome/locale/ru@petr1708/network-settings.dtd
+++ b/src/chrome/locale/ru@petr1708/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ru@petr1708/progress.dtd b/src/chrome/locale/ru@petr1708/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ru@petr1708/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/sco/network-settings.dtd
+++ b/src/chrome/locale/sco/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sco/progress.dtd b/src/chrome/locale/sco/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/sco/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd
index 11e3069..eca83b0 100644
--- a/src/chrome/locale/si-LK/network-settings.dtd
+++ b/src/chrome/locale/si-LK/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/si-LK/progress.dtd b/src/chrome/locale/si-LK/progress.dtd
deleted file mode 100644
index 6377cf4..0000000
--- a/src/chrome/locale/si-LK/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor තත�ත��ය ">
-<!ENTITY torprogress.openSettings "��ට��ම� ����ත �රන�න">
-<!ENTITY torprogress.heading "Tor ජ�ලය �� �ම�බන�ධ ��ම�න�">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd
index 1831549..f6c15c9 100644
--- a/src/chrome/locale/sk-SK/network-settings.dtd
+++ b/src/chrome/locale/sk-SK/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Prostredníctvom Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Ako posledné východisko, môžete poslať milý e-mail na help@xxxxxxxxxxxxxxxxx a požiadať o adresy premostenia.&#160; Berte, prosím, na vedomie, že niekto bude musieť na každú požiadavku samostatne reagovať.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Prosím poÄ?kajte na vytvorenie pripojenia do siete Tor.&#160; Môže to trvaÅ¥ niekoľko minút. ">
diff --git a/src/chrome/locale/sk-SK/progress.dtd b/src/chrome/locale/sk-SK/progress.dtd
deleted file mode 100644
index 272fc72..0000000
--- a/src/chrome/locale/sk-SK/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Otvoriť nastavenia">
-<!ENTITY torprogress.heading "Pripájanie do siete Tor ">
-<!ENTITY torprogress.pleaseWait "Prosím poÄ?kajte na vytvorenie pripojenia do siete Tor.&#160; Môže to trvaÅ¥ niekoľko minút. ">
diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd
index f86e26a..17e8026 100644
--- a/src/chrome/locale/sk/network-settings.dtd
+++ b/src/chrome/locale/sk/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, alebo https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Cez Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Ako poslednú možnosť si môžete vyžiadať adresy mostov zaslaním zdvorilého emailu na adresu help@xxxxxxxxxxxxxxxxx.&#160; Prosíme berte na vedomie, že príslušná osoba musí odpovedať na každú jednu podobnú žiadosť.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sk/progress.dtd b/src/chrome/locale/sk/progress.dtd
deleted file mode 100644
index fcb403f..0000000
--- a/src/chrome/locale/sk/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor status">
-<!ENTITY torprogress.openSettings "Otvor nastavenia">
-<!ENTITY torprogress.heading "Pripájanie do siete Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd
index 6ddb6e3..5ba1f32 100644
--- a/src/chrome/locale/sl-SI/network-settings.dtd
+++ b/src/chrome/locale/sl-SI/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Preko table PomoÄ?i">
 <!ENTITY torsettings.bridgeHelp4 "Kot skrajni ukrep, lahko zahtevate premostitvene naslove s poÅ¡iljanjem olikanega e-sporoÄ?ila na help@xxxxxxxxxxxxxxxxx.&#160; Prosimo, upoÅ¡tevajte, da dotiÄ?na oseba odgovarja na vsako zahtevo.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sl-SI/progress.dtd b/src/chrome/locale/sl-SI/progress.dtd
deleted file mode 100644
index 95372f9..0000000
--- a/src/chrome/locale/sl-SI/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor stanje">
-<!ENTITY torprogress.openSettings "Odpri Nastavitve">
-<!ENTITY torprogress.heading "Povezovanje v Tor omrežje">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd
index b7c53c2..c89784c 100644
--- a/src/chrome/locale/sl/network-settings.dtd
+++ b/src/chrome/locale/sl/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sl/progress.dtd b/src/chrome/locale/sl/progress.dtd
deleted file mode 100644
index 5d12bf5..0000000
--- a/src/chrome/locale/sl/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor stanje">
-<!ENTITY torprogress.openSettings "Odpri nastavitve">
-<!ENTITY torprogress.heading "Povezovanje v Tor omrežje">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/sn/network-settings.dtd
+++ b/src/chrome/locale/sn/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sn/progress.dtd b/src/chrome/locale/sn/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/sn/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/so/network-settings.dtd
+++ b/src/chrome/locale/so/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/so/progress.dtd b/src/chrome/locale/so/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/so/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/son/network-settings.dtd
+++ b/src/chrome/locale/son/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/son/progress.dtd b/src/chrome/locale/son/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/son/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd
index 75ece3b..9c78c3c 100644
--- a/src/chrome/locale/sq-AL/network-settings.dtd
+++ b/src/chrome/locale/sq-AL/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sq-AL/progress.dtd b/src/chrome/locale/sq-AL/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/sq-AL/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd
index ffa38c1..c0fd25a 100644
--- a/src/chrome/locale/sq/network-settings.dtd
+++ b/src/chrome/locale/sq/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Përmes Help Desk-ut">
 <!ENTITY torsettings.bridgeHelp4 "Si mjet të fundit, ju mund të kërkoni adresat urë, duke dërguar një mesazh e-poste me politesë tek help@xxxxxxxxxxxxxxxxx.&#160; Ju lutemi vini re se një person do të duhet t'i përgjigjet çdo kërkese.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.&#160; Kjo mund të kërkojë disa minuta.">
diff --git a/src/chrome/locale/sq/progress.dtd b/src/chrome/locale/sq/progress.dtd
deleted file mode 100644
index f680a4c..0000000
--- a/src/chrome/locale/sq/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Gjendja e Tor">
-<!ENTITY torprogress.openSettings "Hapeni Konfigurimin">
-<!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor">
-<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.&#160; Kjo mund të kërkojë disa minuta.">
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index be5b44b..e27b1ab 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sr/progress.dtd b/src/chrome/locale/sr/progress.dtd
deleted file mode 100644
index ef5e90c..0000000
--- a/src/chrome/locale/sr/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "ТоÑ? Ñ?Ñ?аÑ?Ñ?Ñ?">
-<!ENTITY torprogress.openSettings "Ð?Ñ?воÑ?и подеÑ?аваÑ?а">
-<!ENTITY torprogress.heading "Ð?овезиваÑ?е на ТоÑ? мÑ?ежÑ?">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sr@latin/network-settings.dtd b/src/chrome/locale/sr@latin/network-settings.dtd
index 67da423..9f1ed4a 100644
--- a/src/chrome/locale/sr@latin/network-settings.dtd
+++ b/src/chrome/locale/sr@latin/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sr@latin/progress.dtd b/src/chrome/locale/sr@latin/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/sr@latin/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/st/network-settings.dtd
+++ b/src/chrome/locale/st/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/st/progress.dtd b/src/chrome/locale/st/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/st/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/su/network-settings.dtd
+++ b/src/chrome/locale/su/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/su/progress.dtd b/src/chrome/locale/su/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/su/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd
index 6ce1473..a62de6e 100644
--- a/src/chrome/locale/sv-SE/network-settings.dtd
+++ b/src/chrome/locale/sv-SE/network-settings.dtd
@@ -53,3 +53,6 @@
 <!ENTITY torsettings.bridgeHelp2 "">
 <!ENTITY torsettings.bridgeHelp3 "">
 <!ENTITY torsettings.bridgeHelp4 "">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "">
diff --git a/src/chrome/locale/sv-SE/progress.dtd b/src/chrome/locale/sv-SE/progress.dtd
deleted file mode 100644
index e0dcfcc..0000000
--- a/src/chrome/locale/sv-SE/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "">
-<!ENTITY torprogress.openSettings "">
-<!ENTITY torprogress.heading "">
-<!ENTITY torprogress.pleaseWait "">
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index 0648ead..4b118b6 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eller https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Via supporten">
 <!ENTITY torsettings.bridgeHelp4 "Som en sista utväg kan du skicka ett artigt e-post meddelande på engelska till help@xxxxxxxxxxxxxxxxx, och fråga efter bryggadresser.&#160; Tänk på att en person måste svara på varje sådan förfrågan.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.&#160; Detta kan ta flera minuter.">
diff --git a/src/chrome/locale/sv/progress.dtd b/src/chrome/locale/sv/progress.dtd
deleted file mode 100644
index 1df097b..0000000
--- a/src/chrome/locale/sv/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor-status">
-<!ENTITY torprogress.openSettings "�ppna inställningar">
-<!ENTITY torprogress.heading "Ansluter till Tor-nätverket">
-<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.&#160; Detta kan ta flera minuter.">
diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/sw/network-settings.dtd
+++ b/src/chrome/locale/sw/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/sw/progress.dtd b/src/chrome/locale/sw/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/sw/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/szl/network-settings.dtd
+++ b/src/chrome/locale/szl/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/szl/progress.dtd b/src/chrome/locale/szl/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/szl/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index 02e8fad..70a6dd5 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ta/progress.dtd b/src/chrome/locale/ta/progress.dtd
deleted file mode 100644
index 3bbd799..0000000
--- a/src/chrome/locale/ta/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor நில�ம�">
-<!ENTITY torprogress.openSettings "�ம�ப�ப����ள� திற">
-<!ENTITY torprogress.heading "Tor ந���வ�ார����ிற��� �ண����ிறத�">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd
index bb258de..19661a8 100644
--- a/src/chrome/locale/te-IN/network-settings.dtd
+++ b/src/chrome/locale/te-IN/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/te-IN/progress.dtd b/src/chrome/locale/te-IN/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/te-IN/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/te/network-settings.dtd
+++ b/src/chrome/locale/te/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/te/progress.dtd b/src/chrome/locale/te/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/te/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/tg/network-settings.dtd
+++ b/src/chrome/locale/tg/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tg/progress.dtd b/src/chrome/locale/tg/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/tg/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd
index 240e71b..ded8092 100644
--- a/src/chrome/locale/th/network-settings.dtd
+++ b/src/chrome/locale/th/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/th/progress.dtd b/src/chrome/locale/th/progress.dtd
deleted file mode 100644
index 9a6d686..0000000
--- a/src/chrome/locale/th/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "ส�า�ะ Tor">
-<!ENTITY torprogress.openSettings "��ิ��าร�ั����า">
-<!ENTITY torprogress.heading "�ำลั���ื�อม��อสู���รือ��าย Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ti/network-settings.dtd
+++ b/src/chrome/locale/ti/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ti/progress.dtd b/src/chrome/locale/ti/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ti/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/tk/network-settings.dtd
+++ b/src/chrome/locale/tk/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tk/progress.dtd b/src/chrome/locale/tk/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/tk/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index 2d99d30..1114d4a 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ya da https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Yardım masası yoluyla">
 <!ENTITY torsettings.bridgeHelp4 "Son yol olarak, köprü adreslerini help@xxxxxxxxxxxxxxxxx adresine göndereceÄ?iniz nazik bir e-posta ile isteyebilirsiniz.&#160; Her isteÄ?i bir kiÅ?inin yanıtlayacaÄ?ını unutmayın.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Lütfen Tor&#160;aÄ?ı ile baÄ?lantı kurulurken bekleyin. Bu iÅ?lem birkaç dakika sürebilir.">
diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd
deleted file mode 100644
index 76930b0..0000000
--- a/src/chrome/locale/tr/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Durumu">
-<!ENTITY torprogress.openSettings "Ayarları Aç">
-<!ENTITY torprogress.heading "Tor aÄ?ına baÄ?lanılıyor">
-<!ENTITY torprogress.pleaseWait "Lütfen Tor&#160;aÄ?ı ile baÄ?lantı kurulurken bekleyin. Bu iÅ?lem birkaç dakika sürebilir.">
diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd
index 5df3df6..4ed6ade 100644
--- a/src/chrome/locale/uk/network-settings.dtd
+++ b/src/chrome/locale/uk/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com або https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "ЧеÑ?ез допомогÑ?">
 <!ENTITY torsettings.bridgeHelp4 "У кÑ?айнÑ?омÑ? випадкÑ?, Ð?и можеÑ?е оÑ?Ñ?имаÑ?и адÑ?еÑ?Ñ? моÑ?Ñ?Ñ?, вÑ?дпÑ?авивÑ?и ввÑ?Ñ?ливе повÑ?домленнÑ? на адÑ?еÑ?Ñ?  help@xxxxxxxxxxxxxxxxx.&#160; Ð?веÑ?нÑ?Ñ?Ñ? Ñ?вагÑ? на Ñ?е, Ñ?о кожен запиÑ? обÑ?облÑ?Ñ?Ñ?Ñ?Ñ?Ñ? лÑ?диноÑ?.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Ð?Ñ?дÑ? лаÑ?ка, заÑ?екайÑ?е, поки ми пÑ?дклÑ?Ñ?аÑ?моÑ?Ñ? до меÑ?ежÑ? Tor.&#160; Це може зайнÑ?Ñ?и кÑ?лÑ?ка Ñ?вилин.">
diff --git a/src/chrome/locale/uk/progress.dtd b/src/chrome/locale/uk/progress.dtd
deleted file mode 100644
index 4e5e458..0000000
--- a/src/chrome/locale/uk/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "СÑ?аÑ?Ñ?Ñ? Tor">
-<!ENTITY torprogress.openSettings "Ð?Ñ?дкÑ?иÑ?и Ð?алаÑ?Ñ?Ñ?ваннÑ?">
-<!ENTITY torprogress.heading "Ð?Ñ?дклÑ?Ñ?еннÑ? до меÑ?ежÑ? Tor">
-<!ENTITY torprogress.pleaseWait "Ð?Ñ?дÑ? лаÑ?ка, заÑ?екайÑ?е, поки ми пÑ?дклÑ?Ñ?аÑ?моÑ?Ñ? до меÑ?ежÑ? Tor.&#160; Це може зайнÑ?Ñ?и кÑ?лÑ?ка Ñ?вилин.">
diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd
index 67a1700..9243e1a 100644
--- a/src/chrome/locale/ur-PK/network-settings.dtd
+++ b/src/chrome/locale/ur-PK/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ur-PK/progress.dtd b/src/chrome/locale/ur-PK/progress.dtd
deleted file mode 100644
index 4cd92e2..0000000
--- a/src/chrome/locale/ur-PK/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "ٹار اسٹÛ?ٹس">
-<!ENTITY torprogress.openSettings "ترتÛ?بات Ú©Ú¾Ù?Ù?Û?Úº">
-<!ENTITY torprogress.heading "ٹار Ù?Û?Ù¹ Ù?رکس سÛ? رابطÛ? بÙ?ائÛ?Úº">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index de0c4e6..bb905b0 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ur/progress.dtd b/src/chrome/locale/ur/progress.dtd
deleted file mode 100644
index 991c7ef..0000000
--- a/src/chrome/locale/ur/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Ø·Ù?ر Ú©Û? Ø­Û?Ø«Û?ت">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd
index c3dc757..f18ebee 100644
--- a/src/chrome/locale/uz/network-settings.dtd
+++ b/src/chrome/locale/uz/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/uz/progress.dtd b/src/chrome/locale/uz/progress.dtd
deleted file mode 100644
index 7d6c8ec..0000000
--- a/src/chrome/locale/uz/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor holati">
-<!ENTITY torprogress.openSettings "Moslamalarni ochish">
-<!ENTITY torprogress.heading "Tor tarmog'iga ulanish">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/ve/network-settings.dtd
+++ b/src/chrome/locale/ve/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/ve/progress.dtd b/src/chrome/locale/ve/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/ve/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index e5d368a..b48aed1 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Thông qua Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "NhÆ° là phÆ°Æ¡ng thức cuá»?i cùng, bạn có thá»? yêu cầu Ä?á»?a chá»? cầu ná»?i bằng cách gá»­i má»?t email lá»?ch sá»± tá»?i help@xxxxxxxxxxxxxxxxx.&#160; Vui lòng lÆ°u ý rằng má»?t ngÆ°á»?i cần phải phản há»?i tá»?i từng yêu cầu.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Vui lòng ch� trong khi chúng tôi thiết lập kết n�i t�i mạng lư�i Tor.&#160; Vi�c này có th� mất m�t vài phút.">
diff --git a/src/chrome/locale/vi/progress.dtd b/src/chrome/locale/vi/progress.dtd
deleted file mode 100644
index fdf5f7d..0000000
--- a/src/chrome/locale/vi/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Trạng thái Tor">
-<!ENTITY torprogress.openSettings "Những cài Ä?ặt má»?">
-<!ENTITY torprogress.heading "Ä?ang kết ná»?i vá»?i mạng Tor">
-<!ENTITY torprogress.pleaseWait "Vui lòng ch� trong khi chúng tôi thiết lập kết n�i t�i mạng lư�i Tor.&#160; Vi�c này có th� mất m�t vài phút.">
diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/wa/network-settings.dtd
+++ b/src/chrome/locale/wa/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/wa/progress.dtd b/src/chrome/locale/wa/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/wa/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/wo/network-settings.dtd
+++ b/src/chrome/locale/wo/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/wo/progress.dtd b/src/chrome/locale/wo/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/wo/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd
new file mode 100644
index 0000000..13c9d3a
--- /dev/null
+++ b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd
@@ -0,0 +1,3 @@
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established.">
diff --git a/src/chrome/locale/zh-CN.GB2312/progress.dtd b/src/chrome/locale/zh-CN.GB2312/progress.dtd
deleted file mode 100644
index 16491f9..0000000
--- a/src/chrome/locale/zh-CN.GB2312/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established.">
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index fe39f0f..bad6552 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.netï¼?https://mail.google.com æ??è?? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "è??系客æ??æ?¹å¼?">
 <!ENTITY torsettings.bridgeHelp4 "å¦?æ??以ä¸?æ?¹å¼?æ? æ³?è?·å??æ??é??ç½?æ¡¥ï¼?ä½?为æ??å??ç??ç½?æ¡¥è?·å??æ?¹å¼?ï¼?ä½ å?¯ä»¥å??ä¸?å°?礼è²?ç??é?®ä»¶å??é??å?° help@xxxxxxxxxxxxxxxxxï¼?中æ??å?¯å??é??è?³ help-zh@xxxxxxxxxxxxxxxxxï¼?ã??请注æ??ï¼?æ?¥ç??并å??å¤?è¿?äº?é?®ä»¶ç??并é??æ?ºå?¨äººè??æ?¯æ??æ?¯æ?¯æ??人å??ã??">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "æ­£å?¨ä¸? Tor ç½?ç»?建ç«?è¿?æ?¥ã??è¿?å?¯è?½é??è¦?å? å??é??ï¼?请è??å¿?ç­?å¾?ã??">
diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd
deleted file mode 100644
index dc816a5..0000000
--- a/src/chrome/locale/zh-CN/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor ç?¶æ??">
-<!ENTITY torprogress.openSettings "æ??å¼?设置">
-<!ENTITY torprogress.heading "正��� Tor ��">
-<!ENTITY torprogress.pleaseWait "æ­£å?¨ä¸? Tor ç½?ç»?建ç«?è¿?æ?¥ã??è¿?å?¯è?½é??è¦?å? å??é??ï¼?请è??å¿?ç­?å¾?ã??">
diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd
index 27fe26a..03cf6a1 100644
--- a/src/chrome/locale/zh-HK/network-settings.dtd
+++ b/src/chrome/locale/zh-HK/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net ã?? https://mail.google.com æ?? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "é??é??æ??å??å?°">
 <!ENTITY torsettings.bridgeHelp4 "æ??å¾?æ?¹æ³?ä¿?ï¼?å¯?é?»é?µå?° help@xxxxxxxxxxxxxxxxxã??&#160; è«?注æ??ï¼?æ­¤é¡?é?µä»¶æ??å??é ?ä¸?å°?å°?æ??å??å??è¦?ã??">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "æ??å??æ­£å?¨å»ºç«?é??å¾?Toræ´?è?¥è·¯ç?±ç¶²çµ¡å??é?£ç·?ï¼?è«?ç¨?å??ï¼?&#160;å?¢æ¨£å?¯è?½æ??é??è¦?å¹¾å??é??æ??é??ã??">
diff --git a/src/chrome/locale/zh-HK/progress.dtd b/src/chrome/locale/zh-HK/progress.dtd
deleted file mode 100644
index fbd63d4..0000000
--- a/src/chrome/locale/zh-HK/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Toræ´?è?¥è·¯ç?±ç??æ??">
-<!ENTITY torprogress.openSettings "é??å??設å®?">
-<!ENTITY torprogress.heading "���Tor��路�網絡">
-<!ENTITY torprogress.pleaseWait "æ??å??æ­£å?¨å»ºç«?é??å¾?Toræ´?è?¥è·¯ç?±ç¶²çµ¡å??é?£ç·?ï¼?è«?ç¨?å??ï¼?&#160;å?¢æ¨£å?¯è?½æ??é??è¦?å¹¾å??é??æ??é??ã??">
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index 5e6d31e..dff397b 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com æ??è?? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "é??é??æ??å??å?°">
 <!ENTITY torsettings.bridgeHelp4 "æ??å¾?ç??æ?¹æ³?æ?¯ï¼?æ?¨å?¯ä»¥ç?¼é??ä¸?å°?禮è²?æ?§ç??é?µä»¶å?° help@xxxxxxxxxxxxxxxxxã??&#160; è«?注æ??ï¼?å°?æ?¼æ­¤é¡?é?µä»¶æ??å??å¿?é??è¦?ä¸?å°?å°?å?°æ??å??å??è¦?ã??">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "æ??å??æ­£å?¨å»ºç«?é??å¾?æ´?è?¥è·¯ç?±ç¶²è·¯ç??é?£ç·?ï¼?æ?¬è«?ç¨?ä½?ç­?å¾?ï¼?&#160;å? ç?ºé??å?¯è?½æ??é??è¦?å¹¾å??é??ç??æ??é??ã??">
diff --git a/src/chrome/locale/zh-TW/progress.dtd b/src/chrome/locale/zh-TW/progress.dtd
deleted file mode 100644
index fda5971..0000000
--- a/src/chrome/locale/zh-TW/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "æ´?è?¥è·¯ç?±ç??æ??">
-<!ENTITY torprogress.openSettings "é??å??設å®?">
-<!ENTITY torprogress.heading "正������路�網路">
-<!ENTITY torprogress.pleaseWait "æ??å??æ­£å?¨å»ºç«?é??å¾?æ´?è?¥è·¯ç?±ç¶²è·¯ç??é?£ç·?ï¼?æ?¬è«?ç¨?ä½?ç­?å¾?ï¼?&#160;å? ç?ºé??å?¯è?½æ??é??è¦?å¹¾å??é??ç??æ??é??ã??">
diff --git a/src/chrome/locale/zh/network-settings.dtd b/src/chrome/locale/zh/network-settings.dtd
new file mode 100644
index 0000000..0db3c9c
--- /dev/null
+++ b/src/chrome/locale/zh/network-settings.dtd
@@ -0,0 +1,6 @@
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established.">
diff --git a/src/chrome/locale/zh/progress.dtd b/src/chrome/locale/zh/progress.dtd
deleted file mode 100644
index 16491f9..0000000
--- a/src/chrome/locale/zh/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established.">
diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd
index 0d2e9dc..e28f84e 100644
--- a/src/chrome/locale/zu/network-settings.dtd
+++ b/src/chrome/locale/zu/network-settings.dtd
@@ -73,3 +73,6 @@
 <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxx.&#160; Please note that a person will need to respond to each request.">
+
+<!-- Progress -->
+<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/locale/zu/progress.dtd b/src/chrome/locale/zu/progress.dtd
deleted file mode 100644
index 9ac9ad7..0000000
--- a/src/chrome/locale/zu/progress.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY torprogress.dialog.title "Tor Status">
-<!ENTITY torprogress.openSettings "Open Settings">
-<!ENTITY torprogress.heading "Connecting to the Tor network">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes.">
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index 3b6faba..34b1b3e 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -229,3 +229,16 @@ dialog .help {
 .torWarning .button-icon {
   display: inline !important;
 }
+
+#progressContent > vbox {
+  margin-top: 70px;
+}
+
+#progressPleaseWait {
+  margin-bottom: 30px;
+}
+
+#progressDesc {
+  height: 48px;
+  margin: 20px 30px;
+}
diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css
deleted file mode 100644
index d718452..0000000
--- a/src/chrome/skin/progress.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2014, The Tor Project, Inc.
- * See LICENSE for licensing information.
- *
- * vim: set sw=2 sts=2 ts=8 et syntax=css:
- */
-
-dialog {
-  width: 400px;
-}
-
-#progressHeading {
-  font-size: 110%;
-  margin: 8px 0px 8px 0px;
-  font-weight: bold;
-}
-
-#progressPleaseWait {
-  font-size: 110%;
-  margin-bottom: 15px;
-}
-
-#tbb-icon {
-  list-style-image: url("chrome://torlauncher/skin/default48.png");
-  width: 48px;
-  height: 48px;
-}
-
-#progressDesc {
-  height: 48px;
-}
-
-#progressMeter {
-  margin-bottom: 16px;
-}
-
-.torWarning {
-  list-style-image: url("chrome://torlauncher/skin/warning.png");
-}
-
-/* Ensure that our caution icon is always shown on GTK-based platforms. */
-.torWarning .button-icon {
-  display: inline !important;
-}
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 317dbd7..6f07fdb 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -35,6 +35,8 @@ TorProcessService.prototype =
   kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup",
   kPrefDefaultBridgeType: "extensions.torlauncher.default_bridge_type",
 
+  kWizardProgressPageID: "progress",
+
   kInitialControlConnDelayMS: 25,
   kMaxControlConnRetryMS: 500,
   kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start.
@@ -130,8 +132,8 @@ TorProcessService.prototype =
         // but that caused hangs upon exit in the Firefox 24.x based browser.
         // Apparently, Firefox does not like to process socket I/O while
         // quitting if the browser did not finish starting up (e.g., when
-        // someone presses the Quit button on our Network Settings or progress
-        // window during startup).
+        // someone presses the Quit button on our Network Settings window
+        // during startup).
         TorLauncherLogger.log(4, "Disconnecting from tor process (pid "
                                    + this.mTorProcess.pid + ")");
         this.mProtocolSvc.TorCleanupConnection();
@@ -552,16 +554,11 @@ TorProcessService.prototype =
         // for tor to be restarted. If networking is enabled, show the
         // progress panel (since bootstrapping is underway).
         if (!aIsNetworkForceDisabled && this.mObsSvc)
-          this.mObsSvc.notifyObservers(null, "TorOpenProgressDialog", null);
+          this.mObsSvc.notifyObservers(null, "TorShowProgressPanel", null);
       }
       else if (!this.TorIsBootstrapDone)
       {
-        this._openProgressDialog();
-
-        // Assume that the "Open Settings" button was pressed if Quit was
-        // not pressed and bootstrapping did not finish.
-        if (!this.mQuitSoon && !this.TorIsBootstrapDone)
-          this._openNetworkSettings(true);
+        this._openNetworkSettings(false, this.kWizardProgressPageID);
       }
 
       // If the user pressed "Quit" within settings/progress, exit.
@@ -640,6 +637,7 @@ TorProcessService.prototype =
           // Notify others that an error will be displayed.
           this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason);
 
+// TODO2017: "route" error message to wizard or settings dialog if it is open
           var msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed");
           TorLauncherUtil.showAlert(null, msg + "\n\n" + details);
         }
@@ -722,7 +720,8 @@ TorProcessService.prototype =
     var winFeatures = "chrome,dialog=yes,modal,all";
     var argsArray = this._createOpenWindowArgsArray(aIsInitialBootstrap,
                                                     aStartAtWizardPanel);
-    var url = (aIsInitialBootstrap) ? kWizardURL : kSettingsURL;
+    let isProgress = (this.kWizardProgressPageID == aStartAtWizardPanel);
+    let url = (aIsInitialBootstrap || isProgress) ? kWizardURL : kSettingsURL;
     wwSvc.openWindow(null, url, "_blank", winFeatures, argsArray);
   },
 
@@ -733,16 +732,6 @@ TorProcessService.prototype =
     return wm.getMostRecentWindow("TorLauncher:NetworkSettings");
   },
 
-  _openProgressDialog: function()
-  {
-    var chromeURL = "chrome://torlauncher/content/progress.xul";
-    var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"]
-                  .getService(Ci.nsIWindowWatcher);
-    var winFeatures = "chrome,dialog=yes,modal,all";
-    var argsArray = this._createOpenWindowArgsArray(true);
-    wwSvc.openWindow(null, chromeURL, "_blank", winFeatures, argsArray);
-  },
-
   _createOpenWindowArgsArray: function(aArg1, aArg2)
   {
     var argsArray = Cc["@mozilla.org/array;1"]



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