[tor-launcher/master] Bug 11199: Improve behavior if tor exits.

24 Jul 2014

commit b152a6ed537d08824782b9535daa7c8113418782
Author: Kathy Brade <brade@pearlcrescent.com>
Date:   Thu Jul 24 15:26:02 2014 -0400

    Bug 11199: Improve behavior if tor exits.
    
    If Tor Launcher started the tor process and it exits, display
    a prompt that allows the user to restart tor.
---
 src/chrome/content/network-settings-wizard.xul     |   17 ++--
 src/chrome/content/network-settings.js             |   90 +++++++++++---------
 src/chrome/content/network-settings.xul            |   19 +++--
 src/chrome/content/progress.js                     |    2 +-
 src/chrome/locale/ach/network-settings.dtd         |    2 +-
 src/chrome/locale/ach/torlauncher.properties       |    1 -
 src/chrome/locale/ady/network-settings.dtd         |    2 +-
 src/chrome/locale/ady/torlauncher.properties       |    1 -
 src/chrome/locale/af-ZA/torlauncher.properties     |    1 -
 src/chrome/locale/af/network-settings.dtd          |    2 +-
 src/chrome/locale/af/torlauncher.properties        |    1 -
 src/chrome/locale/ak/network-settings.dtd          |    2 +-
 src/chrome/locale/ak/torlauncher.properties        |    1 -
 src/chrome/locale/am-ET/torlauncher.properties     |    1 -
 src/chrome/locale/am/network-settings.dtd          |    2 +-
 src/chrome/locale/am/torlauncher.properties        |    1 -
 src/chrome/locale/ar/network-settings.dtd          |    2 +-
 src/chrome/locale/ar/torlauncher.properties        |    1 -
 src/chrome/locale/arn/network-settings.dtd         |    2 +-
 src/chrome/locale/arn/torlauncher.properties       |    1 -
 src/chrome/locale/ast/network-settings.dtd         |    2 +-
 src/chrome/locale/ast/torlauncher.properties       |    1 -
 src/chrome/locale/az/network-settings.dtd          |    2 +-
 src/chrome/locale/az/torlauncher.properties        |    1 -
 src/chrome/locale/be/network-settings.dtd          |    2 +-
 src/chrome/locale/be/torlauncher.properties        |    1 -
 src/chrome/locale/bg-BG/torlauncher.properties     |    1 -
 src/chrome/locale/bg/network-settings.dtd          |    2 +-
 src/chrome/locale/bg/torlauncher.properties        |    1 -
 src/chrome/locale/bn-BD/torlauncher.properties     |    1 -
 src/chrome/locale/bn-IN/network-settings.dtd       |    2 +-
 src/chrome/locale/bn-IN/torlauncher.properties     |    1 -
 src/chrome/locale/bn/network-settings.dtd          |    2 +-
 src/chrome/locale/bn/torlauncher.properties        |    1 -
 src/chrome/locale/bo/network-settings.dtd          |    2 +-
 src/chrome/locale/bo/torlauncher.properties        |    1 -
 src/chrome/locale/br/network-settings.dtd          |    2 +-
 src/chrome/locale/br/torlauncher.properties        |    1 -
 src/chrome/locale/bs/network-settings.dtd          |    2 +-
 src/chrome/locale/bs/torlauncher.properties        |    1 -
 src/chrome/locale/ca-ES/torlauncher.properties     |    1 -
 src/chrome/locale/ca/network-settings.dtd          |    2 +-
 src/chrome/locale/ca/torlauncher.properties        |    1 -
 src/chrome/locale/ca@valencia/network-settings.dtd |    1 +
 src/chrome/locale/cs-CZ/torlauncher.properties     |    1 -
 src/chrome/locale/cs/network-settings.dtd          |    2 +-
 src/chrome/locale/cs/torlauncher.properties        |    1 -
 src/chrome/locale/csb/network-settings.dtd         |    2 +-
 src/chrome/locale/csb/torlauncher.properties       |    1 -
 src/chrome/locale/cv/network-settings.dtd          |    2 +-
 src/chrome/locale/cv/torlauncher.properties        |    1 -
 src/chrome/locale/cy/network-settings.dtd          |    2 +-
 src/chrome/locale/cy/torlauncher.properties        |    1 -
 src/chrome/locale/da/network-settings.dtd          |    2 +-
 src/chrome/locale/da/torlauncher.properties        |    1 -
 src/chrome/locale/de/network-settings.dtd          |    2 +-
 src/chrome/locale/de/torlauncher.properties        |    1 -
 src/chrome/locale/dz/network-settings.dtd          |    2 +-
 src/chrome/locale/dz/torlauncher.properties        |    1 -
 src/chrome/locale/el-GR/torlauncher.properties     |    1 -
 src/chrome/locale/el/network-settings.dtd          |    2 +-
 src/chrome/locale/el/torlauncher.properties        |    1 -
 src/chrome/locale/en-GB/network-settings.dtd       |    2 +-
 src/chrome/locale/en-GB/torlauncher.properties     |    1 -
 src/chrome/locale/en/network-settings.dtd          |    2 +-
 src/chrome/locale/en/torlauncher.properties        |    3 +-
 src/chrome/locale/eo/network-settings.dtd          |    2 +-
 src/chrome/locale/eo/torlauncher.properties        |    1 -
 src/chrome/locale/es-AR/network-settings.dtd       |    2 +-
 src/chrome/locale/es-AR/torlauncher.properties     |    1 -
 src/chrome/locale/es-CL/network-settings.dtd       |    2 +-
 src/chrome/locale/es-CL/torlauncher.properties     |    1 -
 src/chrome/locale/es-CO/network-settings.dtd       |    2 +-
 src/chrome/locale/es-CO/torlauncher.properties     |    1 -
 src/chrome/locale/es-MX/network-settings.dtd       |    2 +-
 src/chrome/locale/es-MX/torlauncher.properties     |    1 -
 src/chrome/locale/es-NI/torlauncher.properties     |    1 -
 src/chrome/locale/es/network-settings.dtd          |    2 +-
 src/chrome/locale/es/torlauncher.properties        |    1 -
 src/chrome/locale/et/network-settings.dtd          |    2 +-
 src/chrome/locale/et/torlauncher.properties        |    1 -
 src/chrome/locale/eu/network-settings.dtd          |    2 +-
 src/chrome/locale/eu/torlauncher.properties        |    1 -
 src/chrome/locale/fa/network-settings.dtd          |    2 +-
 src/chrome/locale/fa/torlauncher.properties        |    1 -
 src/chrome/locale/fi/network-settings.dtd          |    2 +-
 src/chrome/locale/fi/torlauncher.properties        |    1 -
 src/chrome/locale/fil/network-settings.dtd         |    2 +-
 src/chrome/locale/fil/torlauncher.properties       |    1 -
 src/chrome/locale/fo/network-settings.dtd          |    2 +-
 src/chrome/locale/fo/torlauncher.properties        |    1 -
 src/chrome/locale/fr-CA/network-settings.dtd       |    2 +-
 src/chrome/locale/fr-CA/torlauncher.properties     |    1 -
 src/chrome/locale/fr/network-settings.dtd          |    2 +-
 src/chrome/locale/fr/torlauncher.properties        |    1 -
 src/chrome/locale/fur/network-settings.dtd         |    2 +-
 src/chrome/locale/fur/torlauncher.properties       |    1 -
 src/chrome/locale/fy/network-settings.dtd          |    2 +-
 src/chrome/locale/fy/torlauncher.properties        |    1 -
 src/chrome/locale/ga/network-settings.dtd          |    2 +-
 src/chrome/locale/ga/torlauncher.properties        |    1 -
 src/chrome/locale/gl/network-settings.dtd          |    2 +-
 src/chrome/locale/gl/torlauncher.properties        |    1 -
 src/chrome/locale/gu-IN/network-settings.dtd       |    2 +-
 src/chrome/locale/gu-IN/torlauncher.properties     |    1 -
 src/chrome/locale/gu/network-settings.dtd          |    2 +-
 src/chrome/locale/gu/torlauncher.properties        |    1 -
 src/chrome/locale/gun/network-settings.dtd         |    2 +-
 src/chrome/locale/gun/torlauncher.properties       |    1 -
 src/chrome/locale/ha/network-settings.dtd          |    2 +-
 src/chrome/locale/ha/torlauncher.properties        |    1 -
 src/chrome/locale/he/network-settings.dtd          |    2 +-
 src/chrome/locale/he/torlauncher.properties        |    1 -
 src/chrome/locale/hi/network-settings.dtd          |    2 +-
 src/chrome/locale/hi/torlauncher.properties        |    1 -
 src/chrome/locale/hr-HR/network-settings.dtd       |    2 +-
 src/chrome/locale/hr-HR/torlauncher.properties     |    1 -
 src/chrome/locale/hr/network-settings.dtd          |    2 +-
 src/chrome/locale/hr/torlauncher.properties        |    1 -
 src/chrome/locale/ht/network-settings.dtd          |    2 +-
 src/chrome/locale/ht/torlauncher.properties        |    1 -
 src/chrome/locale/hu/network-settings.dtd          |    2 +-
 src/chrome/locale/hu/torlauncher.properties        |    1 -
 src/chrome/locale/hy-AM/network-settings.dtd       |    2 +-
 src/chrome/locale/hy-AM/torlauncher.properties     |    1 -
 src/chrome/locale/hy/network-settings.dtd          |    2 +-
 src/chrome/locale/hy/torlauncher.properties        |    1 -
 src/chrome/locale/ia/network-settings.dtd          |    2 +-
 src/chrome/locale/ia/torlauncher.properties        |    1 -
 src/chrome/locale/id/network-settings.dtd          |    2 +-
 src/chrome/locale/id/torlauncher.properties        |    1 -
 src/chrome/locale/is/network-settings.dtd          |    2 +-
 src/chrome/locale/is/torlauncher.properties        |    1 -
 src/chrome/locale/it/network-settings.dtd          |    2 +-
 src/chrome/locale/it/torlauncher.properties        |    1 -
 src/chrome/locale/ja/network-settings.dtd          |    2 +-
 src/chrome/locale/ja/torlauncher.properties        |    1 -
 src/chrome/locale/jv/network-settings.dtd          |    2 +-
 src/chrome/locale/jv/torlauncher.properties        |    1 -
 src/chrome/locale/ka/network-settings.dtd          |    2 +-
 src/chrome/locale/ka/torlauncher.properties        |    1 -
 src/chrome/locale/kk/network-settings.dtd          |    2 +-
 src/chrome/locale/kk/torlauncher.properties        |    1 -
 src/chrome/locale/km/network-settings.dtd          |    2 +-
 src/chrome/locale/km/torlauncher.properties        |    1 -
 src/chrome/locale/kn/network-settings.dtd          |    2 +-
 src/chrome/locale/kn/torlauncher.properties        |    1 -
 src/chrome/locale/ko-KR/network-settings.dtd       |    2 +-
 src/chrome/locale/ko-KR/torlauncher.properties     |    1 -
 src/chrome/locale/ko/network-settings.dtd          |    2 +-
 src/chrome/locale/ko/torlauncher.properties        |    1 -
 src/chrome/locale/ku/network-settings.dtd          |    2 +-
 src/chrome/locale/ku/torlauncher.properties        |    1 -
 src/chrome/locale/kw/network-settings.dtd          |    2 +-
 src/chrome/locale/kw/torlauncher.properties        |    1 -
 src/chrome/locale/ky/network-settings.dtd          |    2 +-
 src/chrome/locale/ky/torlauncher.properties        |    1 -
 src/chrome/locale/lb/network-settings.dtd          |    2 +-
 src/chrome/locale/lb/torlauncher.properties        |    1 -
 src/chrome/locale/lg/network-settings.dtd          |    2 +-
 src/chrome/locale/lg/torlauncher.properties        |    1 -
 src/chrome/locale/ln/network-settings.dtd          |    2 +-
 src/chrome/locale/ln/torlauncher.properties        |    1 -
 src/chrome/locale/lo/network-settings.dtd          |    2 +-
 src/chrome/locale/lo/torlauncher.properties        |    1 -
 src/chrome/locale/lt/network-settings.dtd          |    2 +-
 src/chrome/locale/lt/torlauncher.properties        |    1 -
 src/chrome/locale/lv/network-settings.dtd          |    2 +-
 src/chrome/locale/lv/torlauncher.properties        |    1 -
 src/chrome/locale/mg/network-settings.dtd          |    2 +-
 src/chrome/locale/mg/torlauncher.properties        |    1 -
 src/chrome/locale/mi/network-settings.dtd          |    2 +-
 src/chrome/locale/mi/torlauncher.properties        |    1 -
 src/chrome/locale/mk/network-settings.dtd          |    2 +-
 src/chrome/locale/mk/torlauncher.properties        |    1 -
 src/chrome/locale/ml/network-settings.dtd          |    2 +-
 src/chrome/locale/ml/torlauncher.properties        |    1 -
 src/chrome/locale/mn/network-settings.dtd          |    2 +-
 src/chrome/locale/mn/torlauncher.properties        |    1 -
 src/chrome/locale/mr/network-settings.dtd          |    2 +-
 src/chrome/locale/mr/torlauncher.properties        |    1 -
 src/chrome/locale/ms-MY/network-settings.dtd       |    2 +-
 src/chrome/locale/ms-MY/torlauncher.properties     |    1 -
 src/chrome/locale/ms/network-settings.dtd          |    2 +-
 src/chrome/locale/ms/torlauncher.properties        |    1 -
 src/chrome/locale/mt/network-settings.dtd          |    2 +-
 src/chrome/locale/mt/torlauncher.properties        |    1 -
 src/chrome/locale/my/network-settings.dtd          |    2 +-
 src/chrome/locale/my/torlauncher.properties        |    1 -
 src/chrome/locale/nah/network-settings.dtd         |    2 +-
 src/chrome/locale/nah/torlauncher.properties       |    1 -
 src/chrome/locale/nap/network-settings.dtd         |    2 +-
 src/chrome/locale/nap/torlauncher.properties       |    1 -
 src/chrome/locale/nb/network-settings.dtd          |    2 +-
 src/chrome/locale/nb/torlauncher.properties        |    1 -
 src/chrome/locale/nds/network-settings.dtd         |    2 +-
 src/chrome/locale/nds/torlauncher.properties       |    1 -
 src/chrome/locale/ne/network-settings.dtd          |    2 +-
 src/chrome/locale/ne/torlauncher.properties        |    1 -
 src/chrome/locale/nl-BE/network-settings.dtd       |    2 +-
 src/chrome/locale/nl-BE/torlauncher.properties     |    1 -
 src/chrome/locale/nl/network-settings.dtd          |    2 +-
 src/chrome/locale/nl/torlauncher.properties        |    1 -
 src/chrome/locale/nn/network-settings.dtd          |    2 +-
 src/chrome/locale/nn/torlauncher.properties        |    1 -
 src/chrome/locale/nso/network-settings.dtd         |    2 +-
 src/chrome/locale/nso/torlauncher.properties       |    1 -
 src/chrome/locale/oc/network-settings.dtd          |    2 +-
 src/chrome/locale/oc/torlauncher.properties        |    1 -
 src/chrome/locale/or/network-settings.dtd          |    2 +-
 src/chrome/locale/or/torlauncher.properties        |    1 -
 src/chrome/locale/pa/network-settings.dtd          |    2 +-
 src/chrome/locale/pa/torlauncher.properties        |    1 -
 src/chrome/locale/pap/network-settings.dtd         |    2 +-
 src/chrome/locale/pap/torlauncher.properties       |    1 -
 src/chrome/locale/pl-PL/network-settings.dtd       |    2 +-
 src/chrome/locale/pl-PL/torlauncher.properties     |    1 -
 src/chrome/locale/pl/network-settings.dtd          |    2 +-
 src/chrome/locale/pl/torlauncher.properties        |    1 -
 src/chrome/locale/pms/network-settings.dtd         |    2 +-
 src/chrome/locale/pms/torlauncher.properties       |    1 -
 src/chrome/locale/ps/network-settings.dtd          |    2 +-
 src/chrome/locale/ps/torlauncher.properties        |    1 -
 src/chrome/locale/pt-BR/network-settings.dtd       |    2 +-
 src/chrome/locale/pt-BR/torlauncher.properties     |    1 -
 src/chrome/locale/pt/network-settings.dtd          |    2 +-
 src/chrome/locale/pt/torlauncher.properties        |    1 -
 src/chrome/locale/ro/network-settings.dtd          |    2 +-
 src/chrome/locale/ro/torlauncher.properties        |    1 -
 src/chrome/locale/ru/network-settings.dtd          |    2 +-
 src/chrome/locale/ru/torlauncher.properties        |    1 -
 src/chrome/locale/ru@petr1708/network-settings.dtd |    2 +-
 .../locale/ru@petr1708/torlauncher.properties      |    1 -
 src/chrome/locale/sco/network-settings.dtd         |    2 +-
 src/chrome/locale/sco/torlauncher.properties       |    1 -
 src/chrome/locale/si-LK/network-settings.dtd       |    2 +-
 src/chrome/locale/si-LK/torlauncher.properties     |    1 -
 src/chrome/locale/sk-SK/network-settings.dtd       |    2 +-
 src/chrome/locale/sk-SK/torlauncher.properties     |    1 -
 src/chrome/locale/sk/network-settings.dtd          |    2 +-
 src/chrome/locale/sk/torlauncher.properties        |    1 -
 src/chrome/locale/sl-SI/network-settings.dtd       |    2 +-
 src/chrome/locale/sl-SI/torlauncher.properties     |    1 -
 src/chrome/locale/sl/network-settings.dtd          |    2 +-
 src/chrome/locale/sl/torlauncher.properties        |    1 -
 src/chrome/locale/sn/network-settings.dtd          |    2 +-
 src/chrome/locale/sn/torlauncher.properties        |    1 -
 src/chrome/locale/so/network-settings.dtd          |    2 +-
 src/chrome/locale/so/torlauncher.properties        |    1 -
 src/chrome/locale/son/network-settings.dtd         |    2 +-
 src/chrome/locale/son/torlauncher.properties       |    1 -
 src/chrome/locale/sq-AL/torlauncher.properties     |    1 -
 src/chrome/locale/sq/network-settings.dtd          |    2 +-
 src/chrome/locale/sq/torlauncher.properties        |    1 -
 src/chrome/locale/sr/network-settings.dtd          |    2 +-
 src/chrome/locale/sr/torlauncher.properties        |    1 -
 src/chrome/locale/sr@latin/network-settings.dtd    |    2 +-
 src/chrome/locale/sr@latin/torlauncher.properties  |    1 -
 src/chrome/locale/st/network-settings.dtd          |    2 +-
 src/chrome/locale/st/torlauncher.properties        |    1 -
 src/chrome/locale/su/network-settings.dtd          |    2 +-
 src/chrome/locale/su/torlauncher.properties        |    1 -
 src/chrome/locale/sv-SE/network-settings.dtd       |    2 +-
 src/chrome/locale/sv-SE/torlauncher.properties     |    1 -
 src/chrome/locale/sv/network-settings.dtd          |    2 +-
 src/chrome/locale/sv/torlauncher.properties        |    1 -
 src/chrome/locale/sw/network-settings.dtd          |    2 +-
 src/chrome/locale/sw/torlauncher.properties        |    1 -
 src/chrome/locale/szl/network-settings.dtd         |    2 +-
 src/chrome/locale/szl/torlauncher.properties       |    1 -
 src/chrome/locale/ta/network-settings.dtd          |    2 +-
 src/chrome/locale/ta/torlauncher.properties        |    1 -
 src/chrome/locale/te-IN/network-settings.dtd       |    2 +-
 src/chrome/locale/te-IN/torlauncher.properties     |    1 -
 src/chrome/locale/te/network-settings.dtd          |    2 +-
 src/chrome/locale/te/torlauncher.properties        |    1 -
 src/chrome/locale/tg/network-settings.dtd          |    2 +-
 src/chrome/locale/tg/torlauncher.properties        |    1 -
 src/chrome/locale/th/network-settings.dtd          |    2 +-
 src/chrome/locale/th/torlauncher.properties        |    1 -
 src/chrome/locale/ti/network-settings.dtd          |    2 +-
 src/chrome/locale/ti/torlauncher.properties        |    1 -
 src/chrome/locale/tk/network-settings.dtd          |    2 +-
 src/chrome/locale/tk/torlauncher.properties        |    1 -
 src/chrome/locale/tr/network-settings.dtd          |    2 +-
 src/chrome/locale/tr/torlauncher.properties        |    1 -
 src/chrome/locale/uk/network-settings.dtd          |    2 +-
 src/chrome/locale/uk/torlauncher.properties        |    1 -
 src/chrome/locale/ur-PK/network-settings.dtd       |    2 +-
 src/chrome/locale/ur-PK/torlauncher.properties     |    1 -
 src/chrome/locale/ur/network-settings.dtd          |    2 +-
 src/chrome/locale/ur/torlauncher.properties        |    1 -
 src/chrome/locale/uz/network-settings.dtd          |    2 +-
 src/chrome/locale/uz/torlauncher.properties        |    1 -
 src/chrome/locale/ve/network-settings.dtd          |    2 +-
 src/chrome/locale/ve/torlauncher.properties        |    1 -
 src/chrome/locale/vi/network-settings.dtd          |    2 +-
 src/chrome/locale/vi/torlauncher.properties        |    1 -
 src/chrome/locale/wa/network-settings.dtd          |    2 +-
 src/chrome/locale/wa/torlauncher.properties        |    1 -
 src/chrome/locale/wo/network-settings.dtd          |    2 +-
 src/chrome/locale/wo/torlauncher.properties        |    1 -
 .../locale/zh-CN.GB2312/torlauncher.properties     |    1 -
 src/chrome/locale/zh-CN/network-settings.dtd       |    2 +-
 src/chrome/locale/zh-CN/torlauncher.properties     |    1 -
 src/chrome/locale/zh-HK/network-settings.dtd       |    2 +-
 src/chrome/locale/zh-HK/torlauncher.properties     |    1 -
 src/chrome/locale/zh-TW/network-settings.dtd       |    2 +-
 src/chrome/locale/zh-TW/torlauncher.properties     |    1 -
 src/chrome/locale/zh/torlauncher.properties        |    1 -
 src/chrome/locale/zu/network-settings.dtd          |    2 +-
 src/chrome/locale/zu/torlauncher.properties        |    1 -
 src/chrome/skin/network-settings.css               |    5 +-
 src/components/tl-process.js                       |   36 +++++++-
 src/components/tl-protocol.js                      |   40 ++++++---
 src/modules/tl-util.jsm                            |   38 +++++++++
 316 files changed, 329 insertions(+), 376 deletions(-)

diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul
index da1e275..da81ced 100644
--- a/src/chrome/content/network-settings-wizard.xul
+++ b/src/chrome/content/network-settings-wizard.xul
@@ -155,13 +155,7 @@
     <spring flex="1" />
     <hbox>
       <spring flex="1" />
-      <description id="startingTorMessage">&torsettings.startingTor;</description>
-      <spring flex="1" />
-    </hbox>
-    <hbox>
-      <spring flex="1" />
-      <button id="restartButton" label="&torsettings.restart;" hidden="true"
-              oncommand="onRestartApp()" />
+      <description>&torsettings.startingTor;</description>
       <spring flex="1" />
     </hbox>
     <spring flex="1" />
@@ -173,7 +167,14 @@
     <spring flex="1" />
     <hbox>
       <spring flex="1" />
-      <description id="errorPanelMessage" flex="1"/>
+      <description id="errorPanelMessage" />
+      <spring flex="1" />
+    </hbox>
+    <separator/>
+    <hbox>
+      <spring flex="1" />
+      <button id="restartTorButton" label="&torsettings.restartTor;" hidden="true"
+              oncommand="onRestartTor()" />
       <spring flex="1" />
     </hbox>
     <spring flex="1" />
diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index 4c922bb..bdfb5c1 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -24,6 +24,7 @@ const kSupportAddr = "help@rt.torproject.org";
 const kTorProcessReadyTopic = "TorProcessIsReady";
 const kTorProcessExitedTopic = "TorProcessExited";
 const kTorProcessDidNotStartTopic = "TorProcessDidNotStart";
+const kTorOpenProgressTopic = "TorOpenProgressDialog";
 const kTorBootstrapErrorTopic = "TorBootstrapError";
 const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr";
 
@@ -158,12 +159,16 @@ function initDialog()
   gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false);
   gObsService.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false);
   gObsService.addObserver(gObserver, kTorProcessExitedTopic, false);
+  gObsService.addObserver(gObserver, kTorOpenProgressTopic, false);
 
   var status = gTorProcessService.TorProcessStatus;
   if (TorLauncherUtil.shouldStartAndOwnTor &&
      (status != gTorProcessService.kStatusRunning))
   {
-    showStartingTorPanel(status == gTorProcessService.kStatusExited);
+    if (status == gTorProcessService.kStatusExited)
+      showErrorMessage(true, null);
+    else
+      showStartingTorPanel();
     gObsService.addObserver(gObserver, kTorProcessReadyTopic, false);
     gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false);
   }
@@ -337,12 +342,16 @@ var gObserver = {
     else if (kTorProcessDidNotStartTopic == aTopic)
     {
       gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic);
-      showErrorPanel(aData);
+      showErrorMessage(false, aData);
     }
     else if (kTorProcessExitedTopic == aTopic)
     {
       gObsService.removeObserver(gObserver, kTorProcessExitedTopic);
-      showStartingTorPanel(true);
+      showErrorMessage(true, null);
+    }
+    else if (kTorOpenProgressTopic == aTopic)
+    {
+      openProgressDialog();
     }
   }
 };
@@ -365,7 +374,7 @@ function readTorSettings()
   if (!didSucceed)
   {
     // Unable to communicate with tor.  Hide settings and display an error.
-    showErrorPanel();
+    showErrorMessage(false, null);
 
     setTimeout(function()
         {
@@ -422,34 +431,49 @@ function advanceToWizardPanel(aPanelID)
 }
 
 
-function showStartingTorPanel(aTorExited)
+function showStartingTorPanel()
 {
-  if (aTorExited)
+  var haveWizard = (getWizard() != null);
+  if (haveWizard)
   {
-    // Show "Tor exited; please restart" message and Restart button.
-    var elem = document.getElementById("startingTorMessage");
-    if (elem)
-    {
-      var s1 = TorLauncherUtil.getLocalizedString("tor_exited");
-      var s2 = TorLauncherUtil.getLocalizedString("please_restart_app");
-      elem.textContent = s1 + "\n\n" + s2;
-    }
-    var btn = document.getElementById("restartButton");
-    if (btn)
-      btn.removeAttribute("hidden");
+    showOrHideButton("back", false, false);
+    showOrHideButton("next", false, false);
   }
 
   showPanel("startingTor");
 }
 
 
-function showErrorPanel(aErrorMsg)
+function showErrorMessage(aTorExited, aErrorMsg)
 {
-  showPanel("errorPanel");
   var elem = document.getElementById("errorPanelMessage");
+  var btn = document.getElementById("restartTorButton");
+  if (aTorExited)
+  {
+    // Show "Tor exited" message and "Restart Tor" button.
+    aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited");
+
+    if (btn)
+      btn.removeAttribute("hidden");
+  }
+  else
+  {
+    if (btn)
+      btn.setAttribute("hidden", true);
+  }
+
   if (elem)
     elem.textContent = (aErrorMsg) ? aErrorMsg : "";
 
+  showPanel("errorPanel");
+
+  var haveWizard = (getWizard() != null);
+  if (haveWizard)
+  {
+    showOrHideButton("back", false, false);
+    showOrHideButton("next", false, false);
+  }
+
   var haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred ||
                             gProtocolSvc.TorLogHasWarnOrErr)
   showCopyLogButton(haveErrorOrWarning);
@@ -613,28 +637,16 @@ function onProxyTypeChange()
 }
 
 
-function onRestartApp()
+// Called when user clicks "Restart Tor" button after tor unexpectedly quits.
+function onRestartTor()
 {
-  if (gIsInitialBootstrap)
-  {
-    // If the browser has not fully started yet, we cannot use the app startup
-    // service to restart it... so we use a delayed approach.
-    try
-    {
-      var obsSvc = Cc["@mozilla.org/observer-service;1"]
-                     .getService(Ci.nsIObserverService);
-      obsSvc.notifyObservers(null, "TorUserRequestedQuit", "restart");
+  // Re-add these observers in case they have been removed.
+  gObsService.addObserver(gObserver, kTorProcessReadyTopic, false);
+  gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false);
+  gObsService.addObserver(gObserver, kTorProcessExitedTopic, false);
 
-      window.close();
-    } catch (e) {}
-  }
-  else
-  {
-    // Restart now.
-    var asSvc = Cc["@mozilla.org/toolkit/app-startup;1"]
-                  .getService(Ci.nsIAppStartup);
-    asSvc.quit(asSvc.eAttemptQuit | asSvc.eRestart);
-  }
+  gTorProcessService._startTor();
+  gTorProcessService._controlTor();
 }
 
 
diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul
index 4c4eeed..1fcd4a7 100644
--- a/src/chrome/content/network-settings.xul
+++ b/src/chrome/content/network-settings.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -57,18 +57,27 @@
       <spring flex="1" />
       <hbox>
         <spring flex="1" />
-        <description id="startingTorMessage">&torsettings.startingTor;</description>
+        <description>&torsettings.startingTor;</description>
         <spring flex="1" />
       </hbox>
+      <spring flex="1" />
+    </vbox>
+    <vbox id="errorPanel">
+      <spring flex="1" />
+      <hbox>
+        <spring flex="1" />
+        <description id="errorPanelMessage" />
+        <spring flex="1" />
+      </hbox>
+      <separator/>
       <hbox>
         <spring flex="1" />
-        <button id="restartButton" label="&torsettings.restart;" hidden="true"
-                oncommand="onRestartApp()" />
+        <button id="restartTorButton" label="&torsettings.restartTor;" hidden="true"
+                oncommand="onRestartTor()" />
         <spring flex="1" />
       </hbox>
       <spring flex="1" />
     </vbox>
-    <vbox id="errorPanel"/>
     <vbox id="bridgeHelp" class="help">
       <vbox id="bridgeHelpContent" />
     </vbox>
diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js
index 4cee3d6..30c4370 100644
--- a/src/chrome/content/progress.js
+++ b/src/chrome/content/progress.js
@@ -136,7 +136,7 @@ var gObserver = {
     {
       // TODO: provide a way to access tor log e.g., leave this dialog open
       //       and display the open settings button.
-      onCancel();
+      cleanup();
       window.close();
     }
     else if (kBootstrapStatusTopic == aTopic)
diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ach/network-settings.dtd
+++ b/src/chrome/locale/ach/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ach/torlauncher.properties
+++ b/src/chrome/locale/ach/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ady/network-settings.dtd
+++ b/src/chrome/locale/ady/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ady/torlauncher.properties
+++ b/src/chrome/locale/ady/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/af-ZA/torlauncher.properties b/src/chrome/locale/af-ZA/torlauncher.properties
index a2550db..6457d6b 100644
--- a/src/chrome/locale/af-ZA/torlauncher.properties
+++ b/src/chrome/locale/af-ZA/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/af/network-settings.dtd
+++ b/src/chrome/locale/af/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/af/torlauncher.properties
+++ b/src/chrome/locale/af/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ak/network-settings.dtd
+++ b/src/chrome/locale/ak/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ak/torlauncher.properties
+++ b/src/chrome/locale/ak/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/am-ET/torlauncher.properties b/src/chrome/locale/am-ET/torlauncher.properties
index a2550db..6457d6b 100644
--- a/src/chrome/locale/am-ET/torlauncher.properties
+++ b/src/chrome/locale/am-ET/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/am/network-settings.dtd
+++ b/src/chrome/locale/am/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/am/torlauncher.properties
+++ b/src/chrome/locale/am/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index 508b47a..c8bb154 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "في انتظار تور حتي يبدء بالعمل...">
-<!ENTITY torsettings.restart "إعادة تشغيل">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "اختياري">
 
diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties
index ff393f7..a4fbe15 100644
--- a/src/chrome/locale/ar/torlauncher.properties
+++ b/src/chrome/locale/ar/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=مُشغل تور
 
 torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوقع.
-torlauncher.please_restart_app=يرجي إعادة تشغيل هذا البرنامج.
 torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور.
 torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل.
 torlauncher.tor_control_failed=تعذر التحكم في تور.
diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/arn/network-settings.dtd
+++ b/src/chrome/locale/arn/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/arn/torlauncher.properties
+++ b/src/chrome/locale/arn/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd
index 7518bd5..028263c 100644
--- a/src/chrome/locale/ast/network-settings.dtd
+++ b/src/chrome/locale/ast/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ast/torlauncher.properties
+++ b/src/chrome/locale/ast/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd
index 1677528..b9ca7d7 100644
--- a/src/chrome/locale/az/network-settings.dtd
+++ b/src/chrome/locale/az/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties
index 20a24bb..9e02ff7 100644
--- a/src/chrome/locale/az/torlauncher.properties
+++ b/src/chrome/locale/az/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/be/network-settings.dtd
+++ b/src/chrome/locale/be/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/be/torlauncher.properties
+++ b/src/chrome/locale/be/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bg-BG/torlauncher.properties b/src/chrome/locale/bg-BG/torlauncher.properties
index a2550db..6457d6b 100644
--- a/src/chrome/locale/bg-BG/torlauncher.properties
+++ b/src/chrome/locale/bg-BG/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd
index 3cd0c05..f8f6c79 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира...">
-<!ENTITY torsettings.restart "Рестарт">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Допълнителен">
 
diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties
index d93bd1f..915da30 100644
--- a/src/chrome/locale/bg/torlauncher.properties
+++ b/src/chrome/locale/bg/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Тор лънчер
 
 torlauncher.tor_exited=Тор спря принудително
-torlauncher.please_restart_app=Моля, рестартирайте приложението.
 torlauncher.tor_controlconn_failed=Тор няма връзка с контролния порт
 torlauncher.tor_failed_to_start=Тор не стартира успешно
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties
index a2550db..6457d6b 100644
--- a/src/chrome/locale/bn-BD/torlauncher.properties
+++ b/src/chrome/locale/bn-BD/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/bn-IN/network-settings.dtd
+++ b/src/chrome/locale/bn-IN/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/bn-IN/torlauncher.properties
+++ b/src/chrome/locale/bn-IN/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/bn/network-settings.dtd
+++ b/src/chrome/locale/bn/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/bn/torlauncher.properties
+++ b/src/chrome/locale/bn/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/bo/network-settings.dtd
+++ b/src/chrome/locale/bo/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/bo/torlauncher.properties
+++ b/src/chrome/locale/bo/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/br/network-settings.dtd
+++ b/src/chrome/locale/br/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties
index d7e5faa..e3b08d8 100644
--- a/src/chrome/locale/br/torlauncher.properties
+++ b/src/chrome/locale/br/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd
index e460c45..8dccace 100644
--- a/src/chrome/locale/bs/network-settings.dtd
+++ b/src/chrome/locale/bs/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/bs/torlauncher.properties
+++ b/src/chrome/locale/bs/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ca-ES/torlauncher.properties b/src/chrome/locale/ca-ES/torlauncher.properties
index d82d688..0157189 100644
--- a/src/chrome/locale/ca-ES/torlauncher.properties
+++ b/src/chrome/locale/ca-ES/torlauncher.properties
@@ -4,7 +4,6 @@
 # torlauncher.error_title=Tor Launcher
 
 # torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd
index f98aba3..638d506 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Esperant a Tor per començar...">
-<!ENTITY torsettings.restart "Reinicia">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Opcional
 ">
diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties
index d2e1d15..29b22a2 100644
--- a/src/chrome/locale/ca/torlauncher.properties
+++ b/src/chrome/locale/ca/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Inicialitzador Tor
 
 torlauncher.tor_exited=Tor ha sortit inesperadament.
-torlauncher.please_restart_app=Si us plau reinicia l'aplicació.
 torlauncher.tor_controlconn_failed=Nos'ha pogut conectar al port de control Tor
 torlauncher.tor_failed_to_start=Tor ha fallat al iniciar.
 torlauncher.tor_control_failed=No s'ha pogut prendre el control de Tor.
diff --git a/src/chrome/locale/ca@valencia/network-settings.dtd b/src/chrome/locale/ca@valencia/network-settings.dtd
index 0458e75..dadbdda 100644
--- a/src/chrome/locale/ca@valencia/network-settings.dtd
+++ b/src/chrome/locale/ca@valencia/network-settings.dtd
@@ -27,6 +27,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "">
+<!ENTITY torsettings.restartTor "">
 
 <!ENTITY torsettings.optional "">
 
diff --git a/src/chrome/locale/cs-CZ/torlauncher.properties b/src/chrome/locale/cs-CZ/torlauncher.properties
index a2550db..6457d6b 100644
--- a/src/chrome/locale/cs-CZ/torlauncher.properties
+++ b/src/chrome/locale/cs-CZ/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index 84ca9ee..ff97202 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Čekání na start TORu">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Volitelný">
 
diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties
index 960bc88..cded48b 100644
--- a/src/chrome/locale/cs/torlauncher.properties
+++ b/src/chrome/locale/cs/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor spouštěč
 
 torlauncher.tor_exited=Tor znenadání skončil.
-torlauncher.please_restart_app=Prosím restartujte aplikaci.
 torlauncher.tor_controlconn_failed=Nemohu se připojit ke kontrolnímu portu Tor.
 torlauncher.tor_failed_to_start=Tor nenastartoval.
 torlauncher.tor_control_failed=Nezdařilo se převzít kontrolu nad Tor.
diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/csb/network-settings.dtd
+++ b/src/chrome/locale/csb/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/csb/torlauncher.properties
+++ b/src/chrome/locale/csb/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd
index 6213708..8dd497d 100644
--- a/src/chrome/locale/cv/network-settings.dtd
+++ b/src/chrome/locale/cv/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties
index 5f59ee4..9dc1f18 100644
--- a/src/chrome/locale/cv/torlauncher.properties
+++ b/src/chrome/locale/cv/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd
index be1f716..9525451 100644
--- a/src/chrome/locale/cy/network-settings.dtd
+++ b/src/chrome/locale/cy/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Yn aros am Tor i gychwyn…">
-<!ENTITY torsettings.restart "Ailgychwyn">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Dewisiol">
 
diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties
index f26cdfa..a2e6a2a 100644
--- a/src/chrome/locale/cy/torlauncher.properties
+++ b/src/chrome/locale/cy/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Lansiwr Tor
 
 torlauncher.tor_exited=Gadawodd Tor ar hap.
-torlauncher.please_restart_app=Ailgychwynnwch y rhaglen hon.
 torlauncher.tor_controlconn_failed=Ni allai gysylltu â'r porth rheolaeth Tor.
 torlauncher.tor_failed_to_start=Methodd Tor gychwyn.
 torlauncher.tor_control_failed=Methu cymryd rheolaeth o Tor.
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index e5f79db..da32cfc 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Venter på at Tor starter...">
-<!ENTITY torsettings.restart "Genstart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Valgfri">
 
diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties
index 143d876..13d9a5c 100644
--- a/src/chrome/locale/da/torlauncher.properties
+++ b/src/chrome/locale/da/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor starter
 
 torlauncher.tor_exited=Tor lukkede uventet.
-torlauncher.please_restart_app=Genstart venligst programmet
 torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten.
 torlauncher.tor_failed_to_start=Tor kunne ikke starte.
 torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor.
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index c7d747c..4af4483 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Auf den Start von Tor wird gewartet …">
-<!ENTITY torsettings.restart "Neustart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties
index 8ba8ae1..5f7b2f7 100644
--- a/src/chrome/locale/de/torlauncher.properties
+++ b/src/chrome/locale/de/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor-Starter
 
 torlauncher.tor_exited=Tor wurde unerwartet geschlossen.
-torlauncher.please_restart_app=Bitte starten Sie die Anwendung neu.
 torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden.
 torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen.
 torlauncher.tor_control_failed=Fehler, die Kontrolle über Tor zu übernehmen.
diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/dz/network-settings.dtd
+++ b/src/chrome/locale/dz/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/dz/torlauncher.properties
+++ b/src/chrome/locale/dz/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/el-GR/torlauncher.properties b/src/chrome/locale/el-GR/torlauncher.properties
index a2550db..6457d6b 100644
--- a/src/chrome/locale/el-GR/torlauncher.properties
+++ b/src/chrome/locale/el-GR/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index c7e6443..132bea8 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Αναμονή για να ξεκινήσει το Tor... ">
-<!ENTITY torsettings.restart "Επανεκκίνηση">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Προεραιτικα">
 
diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties
index e3f52f0..74ccbe4 100644
--- a/src/chrome/locale/el/torlauncher.properties
+++ b/src/chrome/locale/el/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Το Tor σταμάτησε απροσδόκητα
-torlauncher.please_restart_app=Παρακαλώ επανεκκινήστε την εφαρμογή. 
 torlauncher.tor_controlconn_failed=Δεν ήταν δυνατή η σύνδεση με την υποδοχη ελέγχου του Tor.
 torlauncher.tor_failed_to_start=Αδυναμία εκκίνησης του Tor.
 torlauncher.tor_control_failed=Απέτυχε να πάρει τον έλεγχο του Tor.
diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/en-GB/network-settings.dtd
+++ b/src/chrome/locale/en-GB/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/en-GB/torlauncher.properties
+++ b/src/chrome/locale/en-GB/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/en/network-settings.dtd
+++ b/src/chrome/locale/en/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties
index d04cac5..bf2426a 100644
--- a/src/chrome/locale/en/torlauncher.properties
+++ b/src/chrome/locale/en/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
+torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
+torlauncher.reconnect=Reconnect
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd
index d3d0327..bdd711d 100644
--- a/src/chrome/locale/eo/network-settings.dtd
+++ b/src/chrome/locale/eo/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties
index 126153c..4eaf84a 100644
--- a/src/chrome/locale/eo/torlauncher.properties
+++ b/src/chrome/locale/eo/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index 5ada2f1..c037e32 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties
index 2b293e8..d62b2fb 100644
--- a/src/chrome/locale/es-AR/torlauncher.properties
+++ b/src/chrome/locale/es-AR/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Lanzador de Tor
 
 torlauncher.tor_exited=Salida inesperada de Tor
-torlauncher.please_restart_app=Por favor, reinicie esta aplicación
 torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control
 torlauncher.tor_failed_to_start=Fallo al iniciar Tor
 torlauncher.tor_control_failed=Falló toma de control de Tor
diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/es-CL/network-settings.dtd
+++ b/src/chrome/locale/es-CL/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/es-CL/torlauncher.properties
+++ b/src/chrome/locale/es-CL/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/es-CO/network-settings.dtd
+++ b/src/chrome/locale/es-CO/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/es-CO/torlauncher.properties
+++ b/src/chrome/locale/es-CO/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd
index 4eba7d2..a2bc877 100644
--- a/src/chrome/locale/es-MX/network-settings.dtd
+++ b/src/chrome/locale/es-MX/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties
index 577f9ea..3507a38 100644
--- a/src/chrome/locale/es-MX/torlauncher.properties
+++ b/src/chrome/locale/es-MX/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Lanzador Tor
 
 torlauncher.tor_exited=Tor se cerró inesperadamente.
-torlauncher.please_restart_app=Por favor reinicie la aplicación.
 torlauncher.tor_controlconn_failed=No se pudo conectar con el puerto de control Tor
 torlauncher.tor_failed_to_start=Tor falló al iniciar.
 torlauncher.tor_control_failed=Falló al tomar control de Tor.
diff --git a/src/chrome/locale/es-NI/torlauncher.properties b/src/chrome/locale/es-NI/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/es-NI/torlauncher.properties
+++ b/src/chrome/locale/es-NI/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index 2bce6c5..24760dc 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Esperando a que Tor arranque...">
-<!ENTITY torsettings.restart "Reiniciar">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Opcional">
 
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties
index c968541..192d1ed 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Arranque de Tor
 
 torlauncher.tor_exited=Tor se cerró inesperadamente.
-torlauncher.please_restart_app=Por favor reinicie esta aplicación.
 torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor
 torlauncher.tor_failed_to_start=Tor no pudo iniciarse.
 torlauncher.tor_control_failed=Fallo al tomar control de Tor.
diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd
index 9c2007a..c1da578 100644
--- a/src/chrome/locale/et/network-settings.dtd
+++ b/src/chrome/locale/et/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties
index b36bf3a..3440bbe 100644
--- a/src/chrome/locale/et/torlauncher.properties
+++ b/src/chrome/locale/et/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd
index c390194..ea1c8cc 100644
--- a/src/chrome/locale/eu/network-settings.dtd
+++ b/src/chrome/locale/eu/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor abiarazi dadin itxaroten...">
-<!ENTITY torsettings.restart "Berrabiarazi">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Hautazkoa">
 
diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties
index 3f4fb59..6a7e78a 100644
--- a/src/chrome/locale/eu/torlauncher.properties
+++ b/src/chrome/locale/eu/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor abiarazlea
 
 torlauncher.tor_exited=Tor ustekabean irten da.
-torlauncher.please_restart_app=Mesedez aplikazio hau berrabiarazi ezazu.
 torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu.
 torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan.
 torlauncher.tor_control_failed=Huts Toren kontrola hartzerakoan.
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index 634ca22..b1294d8 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "در انتظار آغاز به کار تور...">
-<!ENTITY torsettings.restart "شروع دوباره">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "اختیاری">
 
diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties
index fc8ac3b..448b0b8 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=اجرا کننده تور
 
 torlauncher.tor_exited=تور بدلیلی نامشخص خارج شد.
-torlauncher.please_restart_app=لطفا نرم افزار را مجددا راه اندازی نمایید.
 torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی باشد.
 torlauncher.tor_failed_to_start=خطا در راه اندازی.
 torlauncher.tor_control_failed=به‌دست گرفتن کنترل تور ناموفق بود.
diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd
index 934ddf0..4bf8d6d 100644
--- a/src/chrome/locale/fi/network-settings.dtd
+++ b/src/chrome/locale/fi/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Odotetaan Torin käynnistymistä...">
-<!ENTITY torsettings.restart "Käynnistä uudelleen">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Vaihtoehtoinen">
 
diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties
index cdcac17..809b90c 100644
--- a/src/chrome/locale/fi/torlauncher.properties
+++ b/src/chrome/locale/fi/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor-käynnistin
 
 torlauncher.tor_exited=Tor lopetti toimintansa yllättäen.
-torlauncher.please_restart_app=Käynnistä sovellus uudestaan.
 torlauncher.tor_controlconn_failed=Ei voi ottaa yhteyttä Tor-hallintaporttiin.
 torlauncher.tor_failed_to_start=Tor ei käynnistynyt.
 torlauncher.tor_control_failed=Torin haltuun ottaminen epäonnistui.
diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd
index b839b79..b840d23 100644
--- a/src/chrome/locale/fil/network-settings.dtd
+++ b/src/chrome/locale/fil/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties
index 6628d89..64e5fbb 100644
--- a/src/chrome/locale/fil/torlauncher.properties
+++ b/src/chrome/locale/fil/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/fo/network-settings.dtd
+++ b/src/chrome/locale/fo/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/fo/torlauncher.properties
+++ b/src/chrome/locale/fo/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd
index 6a5c2ca..3ef3b9e 100644
--- a/src/chrome/locale/fr-CA/network-settings.dtd
+++ b/src/chrome/locale/fr-CA/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "En attente du démarrage de Tor...">
-<!ENTITY torsettings.restart "Redémarrer">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optionnel">
 
diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties
index e0b1217..d7352f2 100644
--- a/src/chrome/locale/fr-CA/torlauncher.properties
+++ b/src/chrome/locale/fr-CA/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Lanceur Tor
 
 torlauncher.tor_exited=Tor a quitté de manière imprévue.
-torlauncher.please_restart_app=Veuillez redémarrer cette application.
 torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor.
 torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer.
 torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué.
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index 2a4b64e..826e958 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "En attente du démarrage de Tor...">
-<!ENTITY torsettings.restart "Redémarrer">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optionnel">
 
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index d113f54..ac7a128 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Lanceur Tor
 
 torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue.
-torlauncher.please_restart_app=Veuillez redémarrer l'application.
 torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor.
 torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer.
 torlauncher.tor_control_failed=Échec lors de la prise de contrôle de Tor.
diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/fur/network-settings.dtd
+++ b/src/chrome/locale/fur/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/fur/torlauncher.properties
+++ b/src/chrome/locale/fur/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/fy/network-settings.dtd
+++ b/src/chrome/locale/fy/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/fy/torlauncher.properties
+++ b/src/chrome/locale/fy/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ga/network-settings.dtd
+++ b/src/chrome/locale/ga/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ga/torlauncher.properties
+++ b/src/chrome/locale/ga/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd
index e99e31f..2d70aac 100644
--- a/src/chrome/locale/gl/network-settings.dtd
+++ b/src/chrome/locale/gl/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Á espera de que Tor comece ...">
-<!ENTITY torsettings.restart "Reiniciar">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Opcional">
 
diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties
index a636bb3..9526a00 100644
--- a/src/chrome/locale/gl/torlauncher.properties
+++ b/src/chrome/locale/gl/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Lanzador do Tor
 
 torlauncher.tor_exited=O Tor saíu de vez.
-torlauncher.please_restart_app=Por favor reinicie esta aplicación.
 torlauncher.tor_controlconn_failed=Non se puido conectar ao porto de control do Tor.
 torlauncher.tor_failed_to_start=Non se puido iniciar o Tor.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/gu-IN/network-settings.dtd
+++ b/src/chrome/locale/gu-IN/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/gu-IN/torlauncher.properties
+++ b/src/chrome/locale/gu-IN/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd
index dd7aa29..41cc87f 100644
--- a/src/chrome/locale/gu/network-settings.dtd
+++ b/src/chrome/locale/gu/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/gu/torlauncher.properties
+++ b/src/chrome/locale/gu/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/gun/network-settings.dtd
+++ b/src/chrome/locale/gun/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/gun/torlauncher.properties
+++ b/src/chrome/locale/gun/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ha/network-settings.dtd
+++ b/src/chrome/locale/ha/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ha/torlauncher.properties
+++ b/src/chrome/locale/ha/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd
index 9f715b1..cebbcc4 100644
--- a/src/chrome/locale/he/network-settings.dtd
+++ b/src/chrome/locale/he/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "ממתין כעת עבור Tor כדי להתחיל…">
-<!ENTITY torsettings.restart "אתחול">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "רשות">
 
diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties
index 02c123f..6bfcbb2 100644
--- a/src/chrome/locale/he/torlauncher.properties
+++ b/src/chrome/locale/he/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=משגר Tor
 
 torlauncher.tor_exited=‏Tor יצא במפתיעה.
-torlauncher.please_restart_app=אנא הפעל מחדש את יישום זה.
 torlauncher.tor_controlconn_failed=לא הצליח להתחבר ליציאת שליטת Tor.
 torlauncher.tor_failed_to_start=Tor נכשל בהפעלה.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd
index 9688f72..1eeddb6 100644
--- a/src/chrome/locale/hi/network-settings.dtd
+++ b/src/chrome/locale/hi/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/hi/torlauncher.properties
+++ b/src/chrome/locale/hi/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
index 220d7e0..eae3f46 100644
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ b/src/chrome/locale/hr-HR/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Čekanje da se Tor pokrene...">
-<!ENTITY torsettings.restart "Ponovno pokreni ">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Opcionalno">
 
diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties
index ffb1266..26e2174 100644
--- a/src/chrome/locale/hr-HR/torlauncher.properties
+++ b/src/chrome/locale/hr-HR/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Pokretač Tora
 
 torlauncher.tor_exited=Tor je neočekivano izašao.
-torlauncher.please_restart_app=Molimo Vas da ponovno pokrenete ovu aplikaciju.
 torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port.
 torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti.
 torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo.
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index 17b36fc..4f50368 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties
index 587588f..b493793 100644
--- a/src/chrome/locale/hr/torlauncher.properties
+++ b/src/chrome/locale/hr/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ht/network-settings.dtd
+++ b/src/chrome/locale/ht/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ht/torlauncher.properties
+++ b/src/chrome/locale/ht/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd
index 8443763..809421f 100644
--- a/src/chrome/locale/hu/network-settings.dtd
+++ b/src/chrome/locale/hu/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Várakozás a Tor indulására...">
-<!ENTITY torsettings.restart "Újraindítás">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Opcionális">
 
diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties
index a4e7a6f..1cd7c59 100644
--- a/src/chrome/locale/hu/torlauncher.properties
+++ b/src/chrome/locale/hu/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Indító
 
 torlauncher.tor_exited=A Tor váratlanul kilépett.
-torlauncher.please_restart_app=Kérjük indítsa újra ezt az alkalmazást.
 torlauncher.tor_controlconn_failed=Nem lehetséges csatlakozni a Tor vezérlő portjára
 torlauncher.tor_failed_to_start=Nem sikerült elindulnia a Tor-nak.
 torlauncher.tor_control_failed=Nem sikerült átvenni a Tor vezérlését.
diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd
index 345d5d9..63d5339 100644
--- a/src/chrome/locale/hy-AM/network-settings.dtd
+++ b/src/chrome/locale/hy-AM/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/hy-AM/torlauncher.properties b/src/chrome/locale/hy-AM/torlauncher.properties
index 2e628d3..4de491e 100644
--- a/src/chrome/locale/hy-AM/torlauncher.properties
+++ b/src/chrome/locale/hy-AM/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Վերաթողարկեք այս ծրագիրը:
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor-ի թողարկման սխալ;
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/hy/network-settings.dtd
+++ b/src/chrome/locale/hy/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/hy/torlauncher.properties
+++ b/src/chrome/locale/hy/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd
index 25f686e..de5dc49 100644
--- a/src/chrome/locale/ia/network-settings.dtd
+++ b/src/chrome/locale/ia/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties
index 574d73a..6eabb72 100644
--- a/src/chrome/locale/ia/torlauncher.properties
+++ b/src/chrome/locale/ia/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index 8b090d4..eac76c4 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai...">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Opsional">
 
diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties
index 846839f..6f9480b 100644
--- a/src/chrome/locale/id/torlauncher.properties
+++ b/src/chrome/locale/id/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor gagal untuk memulai.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/is/network-settings.dtd
+++ b/src/chrome/locale/is/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties
index f9ec97e..a4e4ce7 100644
--- a/src/chrome/locale/is/torlauncher.properties
+++ b/src/chrome/locale/is/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index 09b068f..7cece0e 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "In attesa di avviare Tor...">
-<!ENTITY torsettings.restart "Riavvia">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Facoltativo">
 
diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties
index cd514cf..a6fc382 100644
--- a/src/chrome/locale/it/torlauncher.properties
+++ b/src/chrome/locale/it/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Avviatore di Tor
 
 torlauncher.tor_exited=Tor si è arrestato inaspettatamente.
-torlauncher.please_restart_app=Per favore riavvia questa applicazione.
 torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor.
 torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor.
 torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor.
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 4fe84c4..7d10085 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Torの開始を待っています...">
-<!ENTITY torsettings.restart "再起動">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "オプション">
 
diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties
index ad50a92..f08b28f 100644
--- a/src/chrome/locale/ja/torlauncher.properties
+++ b/src/chrome/locale/ja/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Torは予期せず終了しました。
-torlauncher.please_restart_app=このアプリケーションを再起動してください。
 torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。
 torlauncher.tor_failed_to_start=Torは開始出来ませんでした。
 torlauncher.tor_control_failed=Tor の制御に失敗しました。
diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/jv/network-settings.dtd
+++ b/src/chrome/locale/jv/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/jv/torlauncher.properties
+++ b/src/chrome/locale/jv/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ka/torlauncher.properties
+++ b/src/chrome/locale/ka/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/kk/network-settings.dtd
+++ b/src/chrome/locale/kk/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/kk/torlauncher.properties
+++ b/src/chrome/locale/kk/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd
index f1b6799..b5e57a5 100644
--- a/src/chrome/locale/km/network-settings.dtd
+++ b/src/chrome/locale/km/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "កំពុងរង់ចាំ Tor ចាប់ផ្ដើម...">
-<!ENTITY torsettings.restart "ចាប់ផ្ដើមឡើងវិញ">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "ជាជម្រើស">
 
diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties
index 6256079..7663cdf 100644
--- a/src/chrome/locale/km/torlauncher.properties
+++ b/src/chrome/locale/km/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=កម្មវិធីចាប់ផ្ដើម Tor
 
 torlauncher.tor_exited=បានចេញពី Tor ដោយមិនរំពឹងទុក
-torlauncher.please_restart_app=សូមចាប់ផ្ដើមកម្មវិធីនេះឡើងវិញ។
 torlauncher.tor_controlconn_failed=មិនអាចភ្ជាប់ទៅច្រកពិនិត្យរបស់ Tor
 torlauncher.tor_failed_to_start=បានបរាជ័យក្នុងការចាប់ផ្ដើម Tor
 torlauncher.tor_control_failed=បានបរាជ័យក្នុងការពិនិត្យ Tor ។
diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd
index 114814b..61c76e2 100644
--- a/src/chrome/locale/kn/network-settings.dtd
+++ b/src/chrome/locale/kn/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties
index 4bcc82c..258712d 100644
--- a/src/chrome/locale/kn/torlauncher.properties
+++ b/src/chrome/locale/kn/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd
index 14f6303..daad46c 100644
--- a/src/chrome/locale/ko-KR/network-settings.dtd
+++ b/src/chrome/locale/ko-KR/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties
index d0daf09..7c34c45 100644
--- a/src/chrome/locale/ko-KR/torlauncher.properties
+++ b/src/chrome/locale/ko-KR/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index 4956dc5..e35599c 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor 시작 대기 중...">
-<!ENTITY torsettings.restart "다시 시작">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "선택">
 
diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties
index ed43d43..a29cd25 100644
--- a/src/chrome/locale/ko/torlauncher.properties
+++ b/src/chrome/locale/ko/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor 브라우저 Launcher
 
 torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다.
-torlauncher.please_restart_app=이 응용프로그램을 다시 시작해 주세요.
 torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다.
 torlauncher.tor_failed_to_start=Tor 시작 실패.
 torlauncher.tor_control_failed=Tor 제어에 실패했습니다.
diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ku/network-settings.dtd
+++ b/src/chrome/locale/ku/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ku/torlauncher.properties
+++ b/src/chrome/locale/ku/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/kw/network-settings.dtd
+++ b/src/chrome/locale/kw/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/kw/torlauncher.properties
+++ b/src/chrome/locale/kw/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd
index 20eb780..dec8285 100644
--- a/src/chrome/locale/ky/network-settings.dtd
+++ b/src/chrome/locale/ky/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties
index 6d13844..7bb504b 100644
--- a/src/chrome/locale/ky/torlauncher.properties
+++ b/src/chrome/locale/ky/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/lb/network-settings.dtd
+++ b/src/chrome/locale/lb/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/lb/torlauncher.properties
+++ b/src/chrome/locale/lb/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/lg/network-settings.dtd
+++ b/src/chrome/locale/lg/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/lg/torlauncher.properties
+++ b/src/chrome/locale/lg/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ln/network-settings.dtd
+++ b/src/chrome/locale/ln/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ln/torlauncher.properties
+++ b/src/chrome/locale/ln/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/lo/network-settings.dtd
+++ b/src/chrome/locale/lo/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/lo/torlauncher.properties
+++ b/src/chrome/locale/lo/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index a619211..c45457f 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties
index 1f6e8d6..5ae3d6d 100644
--- a/src/chrome/locale/lt/torlauncher.properties
+++ b/src/chrome/locale/lt/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd
index 65a23ca..bd6aeaf 100644
--- a/src/chrome/locale/lv/network-settings.dtd
+++ b/src/chrome/locale/lv/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Gaida, kamēr Tor startēs...">
-<!ENTITY torsettings.restart "Restartēt">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Neobligāts">
 
diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties
index 9ce39fd..cbe0e1b 100644
--- a/src/chrome/locale/lv/torlauncher.properties
+++ b/src/chrome/locale/lv/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor palaidējs
 
 torlauncher.tor_exited=Tor negaidīti beidza darbu.
-torlauncher.please_restart_app=Lūdzu, pārstartējiet šo lietotni.
 torlauncher.tor_controlconn_failed=Nevarēja veikt savienojumu ar Tor kontrolportu.
 torlauncher.tor_failed_to_start=Tor'am neizdevās startēt.
 torlauncher.tor_control_failed=Neizdevās pārņemt Tor vadību.
diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/mg/network-settings.dtd
+++ b/src/chrome/locale/mg/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/mg/torlauncher.properties
+++ b/src/chrome/locale/mg/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/mi/network-settings.dtd
+++ b/src/chrome/locale/mi/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/mi/torlauncher.properties
+++ b/src/chrome/locale/mi/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index 6d7d35c..a143b50 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties
index be1a741..98452de 100644
--- a/src/chrome/locale/mk/torlauncher.properties
+++ b/src/chrome/locale/mk/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ml/torlauncher.properties
+++ b/src/chrome/locale/ml/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/mn/network-settings.dtd
+++ b/src/chrome/locale/mn/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/mn/torlauncher.properties
+++ b/src/chrome/locale/mn/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd
index e72eb5f..b599240 100644
--- a/src/chrome/locale/mr/network-settings.dtd
+++ b/src/chrome/locale/mr/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties
index 7ddc1f3..b29d8cf 100644
--- a/src/chrome/locale/mr/torlauncher.properties
+++ b/src/chrome/locale/mr/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=टॉर लाँचर
 
 torlauncher.tor_exited=टॉर अनपेक्षितपणे बंद झाले.
-torlauncher.please_restart_app=हे अप्लिकेशन परत सुरू करा.
 torlauncher.tor_controlconn_failed=टॉर नियंत्रण पोर्टला जोडण्यात अपयश.
 torlauncher.tor_failed_to_start=टॉर सुरू होण्यात अपयश.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd
index ff872c9..53386ff 100644
--- a/src/chrome/locale/ms-MY/network-settings.dtd
+++ b/src/chrome/locale/ms-MY/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Menunggu Tor untuk dimulakan...">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties
index cc510ed..74f8ff9 100644
--- a/src/chrome/locale/ms-MY/torlauncher.properties
+++ b/src/chrome/locale/ms-MY/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Pelancar Tor
 
 torlauncher.tor_exited=Tor telah terkeluar secara tidak sengaja.
-torlauncher.please_restart_app=Sila mulakan semula aplikasi ini.
 torlauncher.tor_controlconn_failed=Tidak dapat menyambung ke port kawalan Tor.
 torlauncher.tor_failed_to_start=Tor gagal untuk bermula.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ms/network-settings.dtd b/src/chrome/locale/ms/network-settings.dtd
index 723a055..0285f9a 100644
--- a/src/chrome/locale/ms/network-settings.dtd
+++ b/src/chrome/locale/ms/network-settings.dtd
@@ -27,7 +27,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "">
-<!ENTITY torsettings.restart "">
+<!ENTITY torsettings.restartTor "">
 
 <!ENTITY torsettings.optional "">
 
diff --git a/src/chrome/locale/ms/torlauncher.properties b/src/chrome/locale/ms/torlauncher.properties
index fcd4d83..0e49bc8 100644
--- a/src/chrome/locale/ms/torlauncher.properties
+++ b/src/chrome/locale/ms/torlauncher.properties
@@ -4,7 +4,6 @@
 # torlauncher.error_title=Tor Launcher
 
 # torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/mt/network-settings.dtd
+++ b/src/chrome/locale/mt/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/mt/torlauncher.properties
+++ b/src/chrome/locale/mt/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd
index 20e74bc..2f2890b 100644
--- a/src/chrome/locale/my/network-settings.dtd
+++ b/src/chrome/locale/my/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "စက်ပြန်ဖွင့်ရန်">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties
index 293d193..3c09784 100644
--- a/src/chrome/locale/my/torlauncher.properties
+++ b/src/chrome/locale/my/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/nah/network-settings.dtd
+++ b/src/chrome/locale/nah/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/nah/torlauncher.properties
+++ b/src/chrome/locale/nah/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/nap/network-settings.dtd
+++ b/src/chrome/locale/nap/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/nap/torlauncher.properties
+++ b/src/chrome/locale/nap/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd
index 6162491..c9e12b4 100644
--- a/src/chrome/locale/nb/network-settings.dtd
+++ b/src/chrome/locale/nb/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Venter på at Tor skal starte...">
-<!ENTITY torsettings.restart "Start på nytt">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Valgfritt">
 
diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties
index 8e56f67..fcacd68 100644
--- a/src/chrome/locale/nb/torlauncher.properties
+++ b/src/chrome/locale/nb/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor ble uventet avsluttet.
-torlauncher.please_restart_app=Vennligst start denne applikasjonen på nytt.
 torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport.
 torlauncher.tor_failed_to_start=Tor kunne ikke starte.
 torlauncher.tor_control_failed=Feilet i ta kontroll over Tor.
diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/nds/network-settings.dtd
+++ b/src/chrome/locale/nds/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/nds/torlauncher.properties
+++ b/src/chrome/locale/nds/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd
index 3a527c2..91c9614 100644
--- a/src/chrome/locale/ne/network-settings.dtd
+++ b/src/chrome/locale/ne/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties
index c3d00d5..a84a1ff 100644
--- a/src/chrome/locale/ne/torlauncher.properties
+++ b/src/chrome/locale/ne/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=टोर सुरुवातकर्ता
 
 torlauncher.tor_exited=टोर अनपेक्षित रुपमा बन्द भयो|
-torlauncher.please_restart_app=कृपया यो सफ्टओएर पुन: संचालन गर्नुहोस |
 torlauncher.tor_controlconn_failed=टोरको नियेंत्रण पोर्टसंग जडान विफल भयो|
 torlauncher.tor_failed_to_start=टोर खुल्न विफल भयो |
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/nl-BE/network-settings.dtd
+++ b/src/chrome/locale/nl-BE/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/nl-BE/torlauncher.properties
+++ b/src/chrome/locale/nl-BE/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index c362a5f..cda2b56 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Aan het wachten tot Tor gestart is...">
-<!ENTITY torsettings.restart "Herstart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optioneel">
 
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index f104345..8483fd6 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Starter
 
 torlauncher.tor_exited=Tor is onverwacht afgesloten.
-torlauncher.please_restart_app=Herstart deze applicatie alstublieft.
 torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort.
 torlauncher.tor_failed_to_start=Tor kon niet starten.
 torlauncher.tor_control_failed=Controle over Tor mislukt.
diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/nn/network-settings.dtd
+++ b/src/chrome/locale/nn/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties
index 8d77b2e..0d95202 100644
--- a/src/chrome/locale/nn/torlauncher.properties
+++ b/src/chrome/locale/nn/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/nso/network-settings.dtd
+++ b/src/chrome/locale/nso/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/nso/torlauncher.properties
+++ b/src/chrome/locale/nso/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/oc/network-settings.dtd
+++ b/src/chrome/locale/oc/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/oc/torlauncher.properties
+++ b/src/chrome/locale/oc/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/or/network-settings.dtd
+++ b/src/chrome/locale/or/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/or/torlauncher.properties
+++ b/src/chrome/locale/or/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd
index 483c12a..b422fe9 100644
--- a/src/chrome/locale/pa/network-settings.dtd
+++ b/src/chrome/locale/pa/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "...ਟੋਰ ਸ਼ੁਰੂ ਹੋਣ ਤੱਕ ਉਡੀਕੋ">
-<!ENTITY torsettings.restart "ਮੁੜ-ਚਾਲੂ">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "ਚੋਣਵਾਂ">
 
diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties
index f0056e4..53661cb 100644
--- a/src/chrome/locale/pa/torlauncher.properties
+++ b/src/chrome/locale/pa/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=ਟੋਰ ਲਾਂਚਰ
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਮੁੜ-ਚਾਲੂ ਕਰੋ
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/pap/network-settings.dtd
+++ b/src/chrome/locale/pap/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/pap/torlauncher.properties
+++ b/src/chrome/locale/pap/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd
index 9a2f3f6..f8cd238 100644
--- a/src/chrome/locale/pl-PL/network-settings.dtd
+++ b/src/chrome/locale/pl-PL/network-settings.dtd
@@ -27,7 +27,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "">
-<!ENTITY torsettings.restart "">
+<!ENTITY torsettings.restartTor "">
 
 <!ENTITY torsettings.optional "">
 
diff --git a/src/chrome/locale/pl-PL/torlauncher.properties b/src/chrome/locale/pl-PL/torlauncher.properties
index 54c1f90..f124981 100644
--- a/src/chrome/locale/pl-PL/torlauncher.properties
+++ b/src/chrome/locale/pl-PL/torlauncher.properties
@@ -4,7 +4,6 @@
 # torlauncher.error_title=Tor Launcher
 
 # torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index 312be05..34ac2c1 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "(opcjonalnie)">
 
diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties
index 32feaa8..155ff50 100644
--- a/src/chrome/locale/pl/torlauncher.properties
+++ b/src/chrome/locale/pl/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor wyłączył się niespodziewanie.
-torlauncher.please_restart_app=Proszę zrestartuj tą aplikację.
 torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora.
 torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora.
 torlauncher.tor_control_failed=Nie udało się przejąć kontroli nad Tor'em.
diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/pms/network-settings.dtd
+++ b/src/chrome/locale/pms/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/pms/torlauncher.properties
+++ b/src/chrome/locale/pms/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ps/network-settings.dtd
+++ b/src/chrome/locale/ps/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ps/torlauncher.properties
+++ b/src/chrome/locale/ps/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd
index 21c75e9..adb733c 100644
--- a/src/chrome/locale/pt-BR/network-settings.dtd
+++ b/src/chrome/locale/pt-BR/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Esperando que Tor inicie...">
-<!ENTITY torsettings.restart "Reiniciar">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Opcional">
 
diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties
index 5e9b860..53942ec 100644
--- a/src/chrome/locale/pt-BR/torlauncher.properties
+++ b/src/chrome/locale/pt-BR/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Inicializador do Tor
 
 torlauncher.tor_exited=Tor fechou inesperadamente.
-torlauncher.please_restart_app=Por favor, reinicie esta aplicação.
 torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle Tor.
 torlauncher.tor_failed_to_start=Falha ao iniciar Tor.
 torlauncher.tor_control_failed=Falha ao receber controle do Tor.
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index c231e10..2b47fd3 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "À espera que o Tor inicie...">
-<!ENTITY torsettings.restart "Reiniciar">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Opcional">
 
diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties
index 780e44c..286c759 100644
--- a/src/chrome/locale/pt/torlauncher.properties
+++ b/src/chrome/locale/pt/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Iniciador Tor
 
 torlauncher.tor_exited=O Tor fechou-se insperadamente.
-torlauncher.please_restart_app=Por favor, reinicie a aplicação.
 torlauncher.tor_controlconn_failed=Não foi possível ligar ao porto de controlo do Tor.
 torlauncher.tor_failed_to_start=O Tor falhou a inicialização.
 torlauncher.tor_control_failed=Falha ao tentar controlar o Tor
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index 42f9cf9..64de5c5 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Reporneste">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties
index 304c008..8fa13e4 100644
--- a/src/chrome/locale/ro/torlauncher.properties
+++ b/src/chrome/locale/ro/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Lansator Tor
 
 torlauncher.tor_exited=Tor a ieșit în mod neașteptat.
-torlauncher.please_restart_app=Vă rugăm reporniți aplicația.
 torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor.
 torlauncher.tor_failed_to_start=Tor nu poate porni.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index ea2ee82..3cf9cd2 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ожидание запуска Tor...">
-<!ENTITY torsettings.restart "Перезапустить">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Необязательно">
 
diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties
index ad50365..bf9debe 100644
--- a/src/chrome/locale/ru/torlauncher.properties
+++ b/src/chrome/locale/ru/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Загрузчик Tor
 
 torlauncher.tor_exited=Tor неожиданно завершился.
-torlauncher.please_restart_app=Пожалуйста, перезапустите приложение
 torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor.
 torlauncher.tor_failed_to_start=Невозможно запустить Tor.
 torlauncher.tor_control_failed=Не удалось взять контроль над Tor.
diff --git a/src/chrome/locale/ru@petr1708/network-settings.dtd b/src/chrome/locale/ru@petr1708/network-settings.dtd
index c6c2c19..bf31d5d 100644
--- a/src/chrome/locale/ru@petr1708/network-settings.dtd
+++ b/src/chrome/locale/ru@petr1708/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ru@petr1708/torlauncher.properties b/src/chrome/locale/ru@petr1708/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ru@petr1708/torlauncher.properties
+++ b/src/chrome/locale/ru@petr1708/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/sco/network-settings.dtd
+++ b/src/chrome/locale/sco/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/sco/torlauncher.properties
+++ b/src/chrome/locale/sco/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd
index 6e09d16..fbd30da 100644
--- a/src/chrome/locale/si-LK/network-settings.dtd
+++ b/src/chrome/locale/si-LK/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "TOR ආරම්භ වනතුරු …">
-<!ENTITY torsettings.restart "යලි අරඹන්න">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "අමතර">
 
diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties
index dc2a9d0..a1f666a 100644
--- a/src/chrome/locale/si-LK/torlauncher.properties
+++ b/src/chrome/locale/si-LK/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor පුරනය
 
 torlauncher.tor_exited=Tor අනපේක්ෂිත ලෙස නැතිවිය. 
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Tor පාලක පොර්ටයට සම්බන්ධ විය නොහැක.
 torlauncher.tor_failed_to_start=Tor ආරම්භ කිරීමට අපොහොසත්ය.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd
index 0b32ddc..ce39661 100644
--- a/src/chrome/locale/sk-SK/network-settings.dtd
+++ b/src/chrome/locale/sk-SK/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Čakanie na štart Toru...">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Voliteľne">
 
diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties
index c70e13d..1f133d6 100644
--- a/src/chrome/locale/sk-SK/torlauncher.properties
+++ b/src/chrome/locale/sk-SK/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor sa nečakane vypol.
-torlauncher.please_restart_app=Prosím, reštartujte túto aplikáciu.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Nepodarilo sa spustiť Tor.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd
index 19e714c..500be4d 100644
--- a/src/chrome/locale/sk/network-settings.dtd
+++ b/src/chrome/locale/sk/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Čakám kým sa Tor spustí...">
-<!ENTITY torsettings.restart "Reštart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Voliteľné">
 
diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties
index 4743463..b016276 100644
--- a/src/chrome/locale/sk/torlauncher.properties
+++ b/src/chrome/locale/sk/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Spúšťač Tor
 
 torlauncher.tor_exited=Tor bol neočakávane ukončený.
-torlauncher.please_restart_app=Prosím reštartujte túto aplikáciu.
 torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor.
 torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť.
 torlauncher.tor_control_failed=Nepodarilo sa prevziať kontrolu nad Torom.
diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/sl-SI/network-settings.dtd
+++ b/src/chrome/locale/sl-SI/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/sl-SI/torlauncher.properties
+++ b/src/chrome/locale/sl-SI/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd
index f22e227..5d461aa 100644
--- a/src/chrome/locale/sl/network-settings.dtd
+++ b/src/chrome/locale/sl/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties
index ed90244..82a1cbd 100644
--- a/src/chrome/locale/sl/torlauncher.properties
+++ b/src/chrome/locale/sl/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor zaganjalnik
 
 torlauncher.tor_exited=Tor je se je nepredvideno zaustavil.
-torlauncher.please_restart_app=Prosimo, da ponovno zaženete to aplikacijo.
 torlauncher.tor_controlconn_failed=Povezava na Tor nadzorna vrata ni uspela.
 torlauncher.tor_failed_to_start=Tor se ni zagnal.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/sn/network-settings.dtd
+++ b/src/chrome/locale/sn/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties
index 4bcdb55..d5fd4d3 100644
--- a/src/chrome/locale/sn/torlauncher.properties
+++ b/src/chrome/locale/sn/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/so/network-settings.dtd
+++ b/src/chrome/locale/so/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/so/torlauncher.properties
+++ b/src/chrome/locale/so/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/son/network-settings.dtd
+++ b/src/chrome/locale/son/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/son/torlauncher.properties
+++ b/src/chrome/locale/son/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sq-AL/torlauncher.properties b/src/chrome/locale/sq-AL/torlauncher.properties
index a2550db..6457d6b 100644
--- a/src/chrome/locale/sq-AL/torlauncher.properties
+++ b/src/chrome/locale/sq-AL/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd
index d52b22c..d3d0ac3 100644
--- a/src/chrome/locale/sq/network-settings.dtd
+++ b/src/chrome/locale/sq/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Duke pritur që Tor të nisë...">
-<!ENTITY torsettings.restart "Rihap">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Fakultativ">
 
diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties
index 9685ea0..26bbbb0 100644
--- a/src/chrome/locale/sq/torlauncher.properties
+++ b/src/chrome/locale/sq/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index 5736f2c..45a74cd 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties
index 2b154b9..2edd6f0 100644
--- a/src/chrome/locale/sr/torlauncher.properties
+++ b/src/chrome/locale/sr/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sr@latin/network-settings.dtd b/src/chrome/locale/sr@latin/network-settings.dtd
index 7ebc424..d1bf809 100644
--- a/src/chrome/locale/sr@latin/network-settings.dtd
+++ b/src/chrome/locale/sr@latin/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/sr@latin/torlauncher.properties b/src/chrome/locale/sr@latin/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/sr@latin/torlauncher.properties
+++ b/src/chrome/locale/sr@latin/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/st/network-settings.dtd
+++ b/src/chrome/locale/st/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/st/torlauncher.properties
+++ b/src/chrome/locale/st/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/su/network-settings.dtd
+++ b/src/chrome/locale/su/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/su/torlauncher.properties
+++ b/src/chrome/locale/su/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd
index 6ce1473..dadbdda 100644
--- a/src/chrome/locale/sv-SE/network-settings.dtd
+++ b/src/chrome/locale/sv-SE/network-settings.dtd
@@ -27,7 +27,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "">
-<!ENTITY torsettings.restart "">
+<!ENTITY torsettings.restartTor "">
 
 <!ENTITY torsettings.optional "">
 
diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties
index fcd4d83..0e49bc8 100644
--- a/src/chrome/locale/sv-SE/torlauncher.properties
+++ b/src/chrome/locale/sv-SE/torlauncher.properties
@@ -4,7 +4,6 @@
 # torlauncher.error_title=Tor Launcher
 
 # torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index b19b788..32f8bec 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Väntar på att Tor ska starta...">
-<!ENTITY torsettings.restart "Starta om">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Valfri">
 
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties
index 1d89986..513810e 100644
--- a/src/chrome/locale/sv/torlauncher.properties
+++ b/src/chrome/locale/sv/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor stängdes av oväntat.
-torlauncher.please_restart_app=Var god starta om det här programmet.
 torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport.
 torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades.
 torlauncher.tor_control_failed=Misslyckades med att ta kontroll över Tor.
diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/sw/network-settings.dtd
+++ b/src/chrome/locale/sw/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/sw/torlauncher.properties
+++ b/src/chrome/locale/sw/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/szl/network-settings.dtd
+++ b/src/chrome/locale/szl/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/szl/torlauncher.properties
+++ b/src/chrome/locale/szl/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index f2acbba..3671894 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor தொடங்குவதற்கு காத்திருக்கிறது...">
-<!ENTITY torsettings.restart "மறுதுவக்கு">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "விருப்பத்தேர்வு">
 
diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties
index a8048f5..39ced49 100644
--- a/src/chrome/locale/ta/torlauncher.properties
+++ b/src/chrome/locale/ta/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor துவக்கி
 
 torlauncher.tor_exited=Tor எதிர்பாராத விதமாக வெளியேறிவிட்டது.
-torlauncher.please_restart_app=இந்த பயன்பாட்டை மறுதொடக்கம் செய்க.
 torlauncher.tor_controlconn_failed=Tor கட்டுப்பாட்டு துறையை இணைக்க முடியவில்லை.
 torlauncher.tor_failed_to_start=Tor தொடங்க முடியவில்லை.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/te-IN/network-settings.dtd
+++ b/src/chrome/locale/te-IN/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/te-IN/torlauncher.properties
+++ b/src/chrome/locale/te-IN/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/te/network-settings.dtd
+++ b/src/chrome/locale/te/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/te/torlauncher.properties
+++ b/src/chrome/locale/te/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/tg/network-settings.dtd
+++ b/src/chrome/locale/tg/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/tg/torlauncher.properties
+++ b/src/chrome/locale/tg/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd
index a0464b4..3781102 100644
--- a/src/chrome/locale/th/network-settings.dtd
+++ b/src/chrome/locale/th/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "รอให้ Tor เริ่มทำงาน...">
-<!ENTITY torsettings.restart "เริ่มทำงานใหม่">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "ตัวเลือก">
 
diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties
index 8e26980..bd38765 100644
--- a/src/chrome/locale/th/torlauncher.properties
+++ b/src/chrome/locale/th/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=ตัวเปิด Tor
 
 torlauncher.tor_exited=Tor ออกจากโปรแกรมโดยไม่คาดคิด
-torlauncher.please_restart_app=กรุณาปิดเปิดแอพพลิเคชัน
 torlauncher.tor_controlconn_failed=ไม่สามารถเชื่อมต่อกับพอร์ตควบคุมของ Tor ได้
 torlauncher.tor_failed_to_start=การเริ่ม Tor ล้มเหลว
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ti/network-settings.dtd
+++ b/src/chrome/locale/ti/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ti/torlauncher.properties
+++ b/src/chrome/locale/ti/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/tk/network-settings.dtd
+++ b/src/chrome/locale/tk/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/tk/torlauncher.properties
+++ b/src/chrome/locale/tk/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index 7ac52b6..e08c7df 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor...">
-<!ENTITY torsettings.restart "Yeniden Başlat">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "İsteğe Bağlı">
 
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index a8773d5..9fc4a88 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Başlatıcı
 
 torlauncher.tor_exited=Tor beklenmedik bir şekilde kapandı.
-torlauncher.please_restart_app=Lütfen bu uygulamayı yeniden başlatın.
 torlauncher.tor_controlconn_failed=Tor yönetim portuna bağlanılamadı.
 torlauncher.tor_failed_to_start=Tor başlatılamadı.
 torlauncher.tor_control_failed=Tor'u kontrol altına alma başarısız
diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd
index c39cf08..10ff964 100644
--- a/src/chrome/locale/uk/network-settings.dtd
+++ b/src/chrome/locale/uk/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Підключення до Tor...">
-<!ENTITY torsettings.restart "Перезавантажити">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Додатково">
 
diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties
index 4045c47..239fd7b 100644
--- a/src/chrome/locale/uk/torlauncher.properties
+++ b/src/chrome/locale/uk/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Завантажувач Tor
 
 torlauncher.tor_exited=Tor несподівано завершився.
-torlauncher.please_restart_app=Будь ласка, перезапустіть цю програму.
 torlauncher.tor_controlconn_failed=Неможливо з'єднатися з портом управління Tor.
 torlauncher.tor_failed_to_start=Tor не зміг запуститися.
 torlauncher.tor_control_failed=Збій отримання контролю над Tor.
diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd
index cd52dd6..a3e772f 100644
--- a/src/chrome/locale/ur-PK/network-settings.dtd
+++ b/src/chrome/locale/ur-PK/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties
index d701651..6c91b1e 100644
--- a/src/chrome/locale/ur-PK/torlauncher.properties
+++ b/src/chrome/locale/ur-PK/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ur/torlauncher.properties
+++ b/src/chrome/locale/ur/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd
index 3fa9532..78f7a1b 100644
--- a/src/chrome/locale/uz/network-settings.dtd
+++ b/src/chrome/locale/uz/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Qayta ishga tushirish">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Qo'shimcha">
 
diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties
index 08ce7aa..667ec18 100644
--- a/src/chrome/locale/uz/torlauncher.properties
+++ b/src/chrome/locale/uz/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Dasturni qayta ishga tushiring
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor ishga tushirish muvaffaqiyatsiz tugadi.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/ve/network-settings.dtd
+++ b/src/chrome/locale/ve/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/ve/torlauncher.properties
+++ b/src/chrome/locale/ve/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index a52ee40..00b0a0f 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Chờ đợi để Tor khởi động..">
-<!ENTITY torsettings.restart "Khởi động lại">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Tuỳ chọn">
 
diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties
index e70b4c1..5247f60 100644
--- a/src/chrome/locale/vi/torlauncher.properties
+++ b/src/chrome/locale/vi/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Vui lòng khởi động lại ứng dụng này.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Chạy Tor thất bại.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/wa/network-settings.dtd
+++ b/src/chrome/locale/wa/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/wa/torlauncher.properties
+++ b/src/chrome/locale/wa/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/wo/network-settings.dtd
+++ b/src/chrome/locale/wo/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/wo/torlauncher.properties
+++ b/src/chrome/locale/wo/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
index d82d688..0157189 100644
--- a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
+++ b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
@@ -4,7 +4,6 @@
 # torlauncher.error_title=Tor Launcher
 
 # torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index 28b973d..56cfaff 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "等待 Tor 启动...">
-<!ENTITY torsettings.restart "重新启动">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "可选">
 
diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties
index 1f17dba..5c4a321 100644
--- a/src/chrome/locale/zh-CN/torlauncher.properties
+++ b/src/chrome/locale/zh-CN/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor 启动器
 
 torlauncher.tor_exited=Tor 意外退出。
-torlauncher.please_restart_app=请重启该应用程序。
 torlauncher.tor_controlconn_failed=无法连接 Tor 控制端口。
 torlauncher.tor_failed_to_start=Tor 无法启动。
 torlauncher.tor_control_failed=控制 Tor 失败。
diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd
index c71c117..511ba2f 100644
--- a/src/chrome/locale/zh-HK/network-settings.dtd
+++ b/src/chrome/locale/zh-HK/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties
index 278038e..2a0fcd8 100644
--- a/src/chrome/locale/zh-HK/torlauncher.properties
+++ b/src/chrome/locale/zh-HK/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor啟動器
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=請重新啟動此程式。
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index 6d66ac6..3b7e359 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "正在等待 Tor 啟動…">
-<!ENTITY torsettings.restart "重新啟動">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "選項">
 
diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties
index 433b0dd..a320633 100644
--- a/src/chrome/locale/zh-TW/torlauncher.properties
+++ b/src/chrome/locale/zh-TW/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor 啟動程式
 
 torlauncher.tor_exited=Tor 未預期的關閉。
-torlauncher.please_restart_app=請重新啟動應用程式。
 torlauncher.tor_controlconn_failed=無法連結至 Tor 控制連接埠。
 torlauncher.tor_failed_to_start=Tor 啟動失敗
 torlauncher.tor_control_failed=無法控制 Tor.
diff --git a/src/chrome/locale/zh/torlauncher.properties b/src/chrome/locale/zh/torlauncher.properties
index d82d688..0157189 100644
--- a/src/chrome/locale/zh/torlauncher.properties
+++ b/src/chrome/locale/zh/torlauncher.properties
@@ -4,7 +4,6 @@
 # torlauncher.error_title=Tor Launcher
 
 # torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd
index a346274..f46473e 100644
--- a/src/chrome/locale/zu/network-settings.dtd
+++ b/src/chrome/locale/zu/network-settings.dtd
@@ -29,7 +29,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restart "Restart">
+<!ENTITY torsettings.restartTor "Restart Tor">
 
 <!ENTITY torsettings.optional "Optional">
 
diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties
index d04cac5..b6b7bd4 100644
--- a/src/chrome/locale/zu/torlauncher.properties
+++ b/src/chrome/locale/zu/torlauncher.properties
@@ -4,7 +4,6 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index b35eb52..a823914 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -98,12 +98,9 @@ button.firstAnswer {
   margin-left: 30px;
 }
 
-#startingTor {
-  min-height: 300px;
-}
-
 wizardpage[pageid="startingTor"] description,
 wizardpage[pageid="errorPanel"] description,
+#errorPanel description,
 #startingTor description {
   font-size: 120%;
   font-weight: bold;
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 2d3a3a3..619a32c 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -140,14 +140,23 @@ TorProcessService.prototype =
 
       this.mTorProcess = null;
       this.mTorProcessStatus = this.kStatusExited;
+      this.mIsBootstrapDone = false;
 
       this.mObsSvc.notifyObservers(null, "TorProcessExited", null);
 
       if (!this.mIsQuitting)
       {
+        this.mProtocolSvc.TorCleanupConnection();
+
         var s = TorLauncherUtil.getLocalizedString("tor_exited");
-        TorLauncherUtil.showAlert(null, s);
         TorLauncherLogger.log(4, s);
+        s += "\n" + TorLauncherUtil.getLocalizedString("tor_connection_lost");
+        var btnLabel = TorLauncherUtil.getLocalizedString("reconnect");
+        if (TorLauncherUtil.showConfirm(null, s, btnLabel) && !this.mIsQuitting)
+        {
+          this._startTor();
+          this._controlTor();
+        }
       }
     }
     else if ("timer-callback" == aTopic)
@@ -420,6 +429,12 @@ TorProcessService.prototype =
           this._openNetworkSettings(true, panelID);
         }
       }
+      else if (this._networkSettingsWindow != null)
+      {
+        // If network settings is open, open progress dialog via notification.
+        if (this.mObsSvc)
+          this.mObsSvc.notifyObservers(null, "TorOpenProgressDialog", null);
+      }
       else
       {
         this._openProgressDialog();
@@ -547,9 +562,19 @@ TorProcessService.prototype =
       TorLauncherUtil.showSaveSettingsAlert(null, errObj.details);
   },
 
-  // Blocks until network settings dialog is closed.
+  // If this window is already open, put up "starting tor" panel, focus it and return.
+  // Otherwise, open the network settings dialog and block until it is closed.
   _openNetworkSettings: function(aIsInitialBootstrap, aStartAtWizardPanel)
   {
+    var win = this._networkSettingsWindow;
+    if (win)
+    {
+      // Return to "Starting tor" panel if being asked to open & dlog already exists.
+      win.showStartingTorPanel();
+      win.focus();
+      return;
+    }
+
     const kSettingsURL = "chrome://torlauncher/content/network-settings.xul";
     const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xul";
 
@@ -562,6 +587,13 @@ TorProcessService.prototype =
     wwSvc.openWindow(null, url, "_blank", winFeatures, argsArray);
   },
 
+  get _networkSettingsWindow()
+  {
+    var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
+               .getService(Ci.nsIWindowMediator);
+    return wm.getMostRecentWindow("TorLauncher:NetworkSettings");
+  },
+
   _openProgressDialog: function()
   {
     var chromeURL = "chrome://torlauncher/content/progress.xul";
diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js
index bcff6ab..85a0165 100644
--- a/src/components/tl-protocol.js
+++ b/src/components/tl-protocol.js
@@ -405,8 +405,7 @@ TorProtocolService.prototype =
   TorCleanupConnection: function()
   {
     this._closeConnection();
-    this._closeConnection(this.mEventMonitorConnection);
-    this.mEventMonitorConnection = null;
+    this._shutDownEventMonitor();
   },
 
   TorStartEventMonitor: function()
@@ -1163,6 +1162,17 @@ TorProtocolService.prototype =
     return this.mRNGService;
   },
 
+  _shutDownEventMonitor: function()
+  {
+    if (this.mEventMonitorConnection)
+    {
+      this._closeConnection(this.mEventMonitorConnection);
+      this.mEventMonitorConnection = null;
+      this.mEventMonitorBuffer = null;
+      this.mEventMonitorInProgressReply = null;
+    }
+  },
+
   _waitForEventData: function()
   {
     if (!this.mEventMonitorConnection)
@@ -1179,15 +1189,25 @@ TorProtocolService.prototype =
           return;
         }
 
-        var binStream = _this.mEventMonitorConnection.binInStream;
-        var bytes = binStream.readBytes(binStream.available());
-        if (!_this.mEventMonitorBuffer)
-          _this.mEventMonitorBuffer = bytes;
-        else
-          _this.mEventMonitorBuffer += bytes;
-        _this._processEventData();
+        try
+        {
+          var binStream = _this.mEventMonitorConnection.binInStream;
+          var bytes = binStream.readBytes(binStream.available());
+          if (!_this.mEventMonitorBuffer)
+            _this.mEventMonitorBuffer = bytes;
+          else
+            _this.mEventMonitorBuffer += bytes;
+          _this._processEventData();
 
-        _this._waitForEventData();
+          _this._waitForEventData();
+        }
+        catch (e)
+        {
+          // Probably we got here because tor exited.  If tor is restarted by
+          // Tor Launcher, the event monitor will be restarted too.
+          TorLauncherLogger.safelog(4, "Event monitor read error", e);
+          _this._shutDownEventMonitor();
+        }
       }
     };
 
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 1754545..1b8c809 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -61,6 +61,44 @@ let TorLauncherUtil =  // Public
     }
   },
 
+  // Returns true if user confirms; false if not.
+  // Note that no prompt is shown (and false is returned) if the Network Settings
+  // window is open.
+  showConfirm: function(aParentWindow, aMsg, aOKButtonLabel)
+  {
+    try
+    {
+      if (!aParentWindow)
+      {
+        var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
+                   .getService(Ci.nsIWindowMediator);
+        aParentWindow = wm.getMostRecentWindow("TorLauncher:NetworkSettings");
+        if (aParentWindow)
+          return false; // Don't show prompt if Network Settings window is open.
+
+        aParentWindow = wm.getMostRecentWindow("navigator:browser");
+      }
+
+      var ps = Cc["@mozilla.org/embedcomp/prompt-service;1"]
+                 .getService(Ci.nsIPromptService);
+      var title = this.getLocalizedString("error_title");
+      var btnFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING)
+                     + ps.BUTTON_POS_0_DEFAULT
+                     + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL);
+
+      var notUsed = { value: false };
+      var btnIndex =  ps.confirmEx(aParentWindow, title, aMsg, btnFlags,
+                                   aOKButtonLabel, null, null, null, notUsed);
+      return (0 == btnIndex);
+    }
+    catch (e)
+    {
+      return confirm(aMsg);
+    }
+
+    return false;
+  },
+
   showSaveSettingsAlert: function(aParentWindow, aDetails)
   {
     if (!aDetails)

    

brade＠torproject.org

tags

participants (1)