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

[tor-commits] [tor-launcher/master] Import strings from transifex.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-launcher/master] Import strings from transifex.
From: mikeperry@xxxxxxxxxxxxxx
Date: Fri, 29 Aug 2014 22:52:34 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 29 Aug 2014 18:53:12 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 660d34e87232bb292cbf36b7f48193299603d5a7
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Fri Aug 29 15:51:15 2014 -0700

    Import strings from transifex.
---
 src/chrome/locale/ach/network-settings.dtd         |   10 ++---
 src/chrome/locale/ach/torlauncher.properties       |    8 ++--
 src/chrome/locale/ady/network-settings.dtd         |   10 ++---
 src/chrome/locale/ady/torlauncher.properties       |    8 ++--
 src/chrome/locale/af/network-settings.dtd          |   10 ++---
 src/chrome/locale/af/torlauncher.properties        |    8 ++--
 src/chrome/locale/ak/network-settings.dtd          |   10 ++---
 src/chrome/locale/ak/torlauncher.properties        |    8 ++--
 src/chrome/locale/am/network-settings.dtd          |   10 ++---
 src/chrome/locale/am/torlauncher.properties        |    8 ++--
 src/chrome/locale/ar/network-settings.dtd          |   12 +++---
 src/chrome/locale/ar/torlauncher.properties        |    8 ++--
 src/chrome/locale/arn/network-settings.dtd         |   10 ++---
 src/chrome/locale/arn/torlauncher.properties       |    8 ++--
 src/chrome/locale/ast/network-settings.dtd         |   10 ++---
 src/chrome/locale/ast/torlauncher.properties       |    8 ++--
 src/chrome/locale/az/network-settings.dtd          |   10 ++---
 src/chrome/locale/az/torlauncher.properties        |    8 ++--
 src/chrome/locale/be/network-settings.dtd          |   16 ++++----
 src/chrome/locale/be/torlauncher.properties        |    8 ++--
 src/chrome/locale/bg/network-settings.dtd          |   10 ++---
 src/chrome/locale/bg/torlauncher.properties        |    8 ++--
 src/chrome/locale/bn-IN/network-settings.dtd       |   10 ++---
 src/chrome/locale/bn-IN/torlauncher.properties     |    8 ++--
 src/chrome/locale/bn/network-settings.dtd          |   10 ++---
 src/chrome/locale/bn/torlauncher.properties        |    8 ++--
 src/chrome/locale/bo/network-settings.dtd          |   10 ++---
 src/chrome/locale/bo/torlauncher.properties        |    8 ++--
 src/chrome/locale/br/network-settings.dtd          |   10 ++---
 src/chrome/locale/br/torlauncher.properties        |    8 ++--
 src/chrome/locale/bs/network-settings.dtd          |   10 ++---
 src/chrome/locale/bs/torlauncher.properties        |    8 ++--
 src/chrome/locale/ca/network-settings.dtd          |   10 ++---
 src/chrome/locale/ca/torlauncher.properties        |    8 ++--
 src/chrome/locale/cs/network-settings.dtd          |   12 +++---
 src/chrome/locale/cs/torlauncher.properties        |    8 ++--
 src/chrome/locale/csb/network-settings.dtd         |   10 ++---
 src/chrome/locale/csb/torlauncher.properties       |    8 ++--
 src/chrome/locale/cv/network-settings.dtd          |   10 ++---
 src/chrome/locale/cv/torlauncher.properties        |    8 ++--
 src/chrome/locale/cy/network-settings.dtd          |   10 ++---
 src/chrome/locale/cy/torlauncher.properties        |    8 ++--
 src/chrome/locale/da/network-settings.dtd          |   12 +++---
 src/chrome/locale/da/torlauncher.properties        |    8 ++--
 src/chrome/locale/de/network-settings.dtd          |   10 ++---
 src/chrome/locale/de/progress.dtd                  |    4 +-
 src/chrome/locale/de/torlauncher.properties        |    8 ++--
 src/chrome/locale/dz/network-settings.dtd          |   10 ++---
 src/chrome/locale/dz/torlauncher.properties        |    8 ++--
 src/chrome/locale/el/network-settings.dtd          |   10 ++---
 src/chrome/locale/el/torlauncher.properties        |    8 ++--
 src/chrome/locale/en-GB/network-settings.dtd       |   10 ++---
 src/chrome/locale/en-GB/torlauncher.properties     |    8 ++--
 src/chrome/locale/eo/network-settings.dtd          |   10 ++---
 src/chrome/locale/eo/torlauncher.properties        |    8 ++--
 src/chrome/locale/es-AR/network-settings.dtd       |   36 +++++++++---------
 src/chrome/locale/es-AR/torlauncher.properties     |    8 ++--
 src/chrome/locale/es-CL/network-settings.dtd       |   10 ++---
 src/chrome/locale/es-CL/torlauncher.properties     |    8 ++--
 src/chrome/locale/es-CO/network-settings.dtd       |   10 ++---
 src/chrome/locale/es-CO/torlauncher.properties     |    8 ++--
 src/chrome/locale/es-MX/network-settings.dtd       |   10 ++---
 src/chrome/locale/es-MX/torlauncher.properties     |    8 ++--
 src/chrome/locale/es/network-settings.dtd          |   22 +++++------
 src/chrome/locale/es/torlauncher.properties        |    8 ++--
 src/chrome/locale/et/network-settings.dtd          |   10 ++---
 src/chrome/locale/et/torlauncher.properties        |   18 +++++----
 src/chrome/locale/eu/network-settings.dtd          |   10 ++---
 src/chrome/locale/eu/torlauncher.properties        |    8 ++--
 src/chrome/locale/fa/network-settings.dtd          |   12 +++---
 src/chrome/locale/fa/torlauncher.properties        |    8 ++--
 src/chrome/locale/fi/network-settings.dtd          |   38 +++++++++----------
 src/chrome/locale/fi/torlauncher.properties        |   34 +++++++++--------
 src/chrome/locale/fil/network-settings.dtd         |   10 ++---
 src/chrome/locale/fil/torlauncher.properties       |    8 ++--
 src/chrome/locale/fo/network-settings.dtd          |   10 ++---
 src/chrome/locale/fo/torlauncher.properties        |    8 ++--
 src/chrome/locale/fr-CA/network-settings.dtd       |   10 ++---
 src/chrome/locale/fr-CA/torlauncher.properties     |    8 ++--
 src/chrome/locale/fr/network-settings.dtd          |   10 ++---
 src/chrome/locale/fr/torlauncher.properties        |    8 ++--
 src/chrome/locale/fur/network-settings.dtd         |   10 ++---
 src/chrome/locale/fur/torlauncher.properties       |    8 ++--
 src/chrome/locale/fy/network-settings.dtd          |   10 ++---
 src/chrome/locale/fy/torlauncher.properties        |    8 ++--
 src/chrome/locale/ga/network-settings.dtd          |   10 ++---
 src/chrome/locale/ga/torlauncher.properties        |    8 ++--
 src/chrome/locale/gl/network-settings.dtd          |   10 ++---
 src/chrome/locale/gl/torlauncher.properties        |    8 ++--
 src/chrome/locale/gu-IN/network-settings.dtd       |   10 ++---
 src/chrome/locale/gu-IN/torlauncher.properties     |    8 ++--
 src/chrome/locale/gu/network-settings.dtd          |   10 ++---
 src/chrome/locale/gu/torlauncher.properties        |    8 ++--
 src/chrome/locale/gun/network-settings.dtd         |   10 ++---
 src/chrome/locale/gun/torlauncher.properties       |    8 ++--
 src/chrome/locale/ha/network-settings.dtd          |   10 ++---
 src/chrome/locale/ha/torlauncher.properties        |    8 ++--
 src/chrome/locale/he/network-settings.dtd          |   12 +++---
 src/chrome/locale/he/torlauncher.properties        |   14 ++++---
 src/chrome/locale/hi/network-settings.dtd          |   10 ++---
 src/chrome/locale/hi/torlauncher.properties        |    8 ++--
 src/chrome/locale/hr-HR/network-settings.dtd       |   12 ++----
 src/chrome/locale/hr-HR/torlauncher.properties     |    8 ++--
 src/chrome/locale/hr/network-settings.dtd          |   10 ++---
 src/chrome/locale/hr/torlauncher.properties        |    8 ++--
 src/chrome/locale/ht/network-settings.dtd          |   10 ++---
 src/chrome/locale/ht/torlauncher.properties        |    8 ++--
 src/chrome/locale/hu/network-settings.dtd          |   10 ++---
 src/chrome/locale/hu/torlauncher.properties        |    8 ++--
 src/chrome/locale/hy-AM/network-settings.dtd       |   10 ++---
 src/chrome/locale/hy-AM/torlauncher.properties     |    8 ++--
 src/chrome/locale/hy/network-settings.dtd          |   10 ++---
 src/chrome/locale/hy/torlauncher.properties        |    8 ++--
 src/chrome/locale/ia/network-settings.dtd          |   10 ++---
 src/chrome/locale/ia/torlauncher.properties        |    8 ++--
 src/chrome/locale/id/network-settings.dtd          |   10 ++---
 src/chrome/locale/id/progress.dtd                  |    2 +-
 src/chrome/locale/id/torlauncher.properties        |    8 ++--
 src/chrome/locale/is/network-settings.dtd          |   10 ++---
 src/chrome/locale/is/torlauncher.properties        |    8 ++--
 src/chrome/locale/it/network-settings.dtd          |   10 ++---
 src/chrome/locale/it/torlauncher.properties        |    8 ++--
 src/chrome/locale/ja/network-settings.dtd          |   12 +++---
 src/chrome/locale/ja/torlauncher.properties        |    8 ++--
 src/chrome/locale/jv/network-settings.dtd          |   10 ++---
 src/chrome/locale/jv/torlauncher.properties        |    8 ++--
 src/chrome/locale/ka/network-settings.dtd          |   10 ++---
 src/chrome/locale/ka/torlauncher.properties        |    8 ++--
 src/chrome/locale/kk/network-settings.dtd          |   10 ++---
 src/chrome/locale/kk/torlauncher.properties        |    8 ++--
 src/chrome/locale/km/network-settings.dtd          |   12 +++---
 src/chrome/locale/km/torlauncher.properties        |    8 ++--
 src/chrome/locale/kn/network-settings.dtd          |   10 ++---
 src/chrome/locale/kn/torlauncher.properties        |    8 ++--
 src/chrome/locale/ko-KR/network-settings.dtd       |   10 ++---
 src/chrome/locale/ko-KR/torlauncher.properties     |    8 ++--
 src/chrome/locale/ko/network-settings.dtd          |   10 ++---
 src/chrome/locale/ko/torlauncher.properties        |    8 ++--
 src/chrome/locale/ku/network-settings.dtd          |   10 ++---
 src/chrome/locale/ku/torlauncher.properties        |    8 ++--
 src/chrome/locale/kw/network-settings.dtd          |   10 ++---
 src/chrome/locale/kw/torlauncher.properties        |    8 ++--
 src/chrome/locale/ky/network-settings.dtd          |   10 ++---
 src/chrome/locale/ky/torlauncher.properties        |    8 ++--
 src/chrome/locale/lb/network-settings.dtd          |   10 ++---
 src/chrome/locale/lb/torlauncher.properties        |    8 ++--
 src/chrome/locale/lg/network-settings.dtd          |   10 ++---
 src/chrome/locale/lg/torlauncher.properties        |    8 ++--
 src/chrome/locale/ln/network-settings.dtd          |   10 ++---
 src/chrome/locale/ln/torlauncher.properties        |    8 ++--
 src/chrome/locale/lo/network-settings.dtd          |   40 ++++++++++----------
 src/chrome/locale/lo/torlauncher.properties        |   10 +++--
 src/chrome/locale/lt/network-settings.dtd          |   10 ++---
 src/chrome/locale/lt/torlauncher.properties        |    8 ++--
 src/chrome/locale/lv/network-settings.dtd          |   12 +++---
 src/chrome/locale/lv/torlauncher.properties        |    8 ++--
 src/chrome/locale/mg/network-settings.dtd          |   10 ++---
 src/chrome/locale/mg/torlauncher.properties        |    8 ++--
 src/chrome/locale/mi/network-settings.dtd          |   10 ++---
 src/chrome/locale/mi/torlauncher.properties        |    8 ++--
 src/chrome/locale/mk/network-settings.dtd          |   10 ++---
 src/chrome/locale/mk/torlauncher.properties        |    8 ++--
 src/chrome/locale/ml/network-settings.dtd          |   10 ++---
 src/chrome/locale/ml/torlauncher.properties        |    8 ++--
 src/chrome/locale/mn/network-settings.dtd          |   10 ++---
 src/chrome/locale/mn/torlauncher.properties        |    8 ++--
 src/chrome/locale/mr/network-settings.dtd          |   10 ++---
 src/chrome/locale/mr/torlauncher.properties        |    8 ++--
 src/chrome/locale/ms-MY/network-settings.dtd       |   10 ++---
 src/chrome/locale/ms-MY/torlauncher.properties     |    8 ++--
 src/chrome/locale/mt/network-settings.dtd          |   10 ++---
 src/chrome/locale/mt/torlauncher.properties        |    8 ++--
 src/chrome/locale/my/network-settings.dtd          |   10 ++---
 src/chrome/locale/my/torlauncher.properties        |    8 ++--
 src/chrome/locale/nah/network-settings.dtd         |   10 ++---
 src/chrome/locale/nah/torlauncher.properties       |    8 ++--
 src/chrome/locale/nap/network-settings.dtd         |   10 ++---
 src/chrome/locale/nap/torlauncher.properties       |    8 ++--
 src/chrome/locale/nb/network-settings.dtd          |   11 ++----
 src/chrome/locale/nb/torlauncher.properties        |    8 ++--
 src/chrome/locale/nds/network-settings.dtd         |   10 ++---
 src/chrome/locale/nds/torlauncher.properties       |    8 ++--
 src/chrome/locale/ne/network-settings.dtd          |   10 ++---
 src/chrome/locale/ne/torlauncher.properties        |    8 ++--
 src/chrome/locale/nl-BE/network-settings.dtd       |   10 ++---
 src/chrome/locale/nl-BE/torlauncher.properties     |    8 ++--
 src/chrome/locale/nl/network-settings.dtd          |   10 ++---
 src/chrome/locale/nl/torlauncher.properties        |    8 ++--
 src/chrome/locale/nn/network-settings.dtd          |   40 ++++++++++----------
 src/chrome/locale/nn/torlauncher.properties        |   24 ++++++------
 src/chrome/locale/nso/network-settings.dtd         |   10 ++---
 src/chrome/locale/nso/torlauncher.properties       |    8 ++--
 src/chrome/locale/oc/network-settings.dtd          |   10 ++---
 src/chrome/locale/oc/torlauncher.properties        |    8 ++--
 src/chrome/locale/or/network-settings.dtd          |   10 ++---
 src/chrome/locale/or/torlauncher.properties        |    8 ++--
 src/chrome/locale/pa/network-settings.dtd          |   10 ++---
 src/chrome/locale/pa/torlauncher.properties        |    8 ++--
 src/chrome/locale/pap/network-settings.dtd         |   10 ++---
 src/chrome/locale/pap/torlauncher.properties       |    8 ++--
 src/chrome/locale/pl/network-settings.dtd          |   10 ++---
 src/chrome/locale/pl/torlauncher.properties        |    8 ++--
 src/chrome/locale/pms/network-settings.dtd         |   10 ++---
 src/chrome/locale/pms/torlauncher.properties       |    8 ++--
 src/chrome/locale/ps/network-settings.dtd          |   10 ++---
 src/chrome/locale/ps/torlauncher.properties        |    8 ++--
 src/chrome/locale/pt-BR/network-settings.dtd       |   12 +++---
 src/chrome/locale/pt-BR/torlauncher.properties     |   10 +++--
 src/chrome/locale/pt/network-settings.dtd          |   10 ++---
 src/chrome/locale/pt/torlauncher.properties        |    8 ++--
 src/chrome/locale/ro/network-settings.dtd          |   10 ++---
 src/chrome/locale/ro/torlauncher.properties        |    8 ++--
 src/chrome/locale/ru/network-settings.dtd          |   12 +++---
 src/chrome/locale/ru/torlauncher.properties        |    8 ++--
 src/chrome/locale/ru@petr1708/network-settings.dtd |   10 ++---
 .../locale/ru@petr1708/torlauncher.properties      |    8 ++--
 src/chrome/locale/sco/network-settings.dtd         |   10 ++---
 src/chrome/locale/sco/torlauncher.properties       |    8 ++--
 src/chrome/locale/si-LK/network-settings.dtd       |   10 ++---
 src/chrome/locale/si-LK/torlauncher.properties     |    8 ++--
 src/chrome/locale/sk-SK/network-settings.dtd       |   10 ++---
 src/chrome/locale/sk-SK/torlauncher.properties     |    8 ++--
 src/chrome/locale/sk/network-settings.dtd          |   10 ++---
 src/chrome/locale/sk/torlauncher.properties        |    8 ++--
 src/chrome/locale/sl-SI/network-settings.dtd       |   10 ++---
 src/chrome/locale/sl-SI/torlauncher.properties     |    8 ++--
 src/chrome/locale/sl/network-settings.dtd          |   10 ++---
 src/chrome/locale/sl/torlauncher.properties        |    8 ++--
 src/chrome/locale/sn/network-settings.dtd          |   10 ++---
 src/chrome/locale/sn/torlauncher.properties        |    8 ++--
 src/chrome/locale/so/network-settings.dtd          |   10 ++---
 src/chrome/locale/so/torlauncher.properties        |    8 ++--
 src/chrome/locale/son/network-settings.dtd         |   10 ++---
 src/chrome/locale/son/torlauncher.properties       |    8 ++--
 src/chrome/locale/sq/network-settings.dtd          |   10 ++---
 src/chrome/locale/sq/torlauncher.properties        |    8 ++--
 src/chrome/locale/sr/network-settings.dtd          |   10 ++---
 src/chrome/locale/sr/torlauncher.properties        |   10 +++--
 src/chrome/locale/sr@latin/network-settings.dtd    |   10 ++---
 src/chrome/locale/sr@latin/torlauncher.properties  |    8 ++--
 src/chrome/locale/st/network-settings.dtd          |   10 ++---
 src/chrome/locale/st/torlauncher.properties        |    8 ++--
 src/chrome/locale/su/network-settings.dtd          |   10 ++---
 src/chrome/locale/su/torlauncher.properties        |    8 ++--
 src/chrome/locale/sv/network-settings.dtd          |   10 ++---
 src/chrome/locale/sv/torlauncher.properties        |    8 ++--
 src/chrome/locale/sw/network-settings.dtd          |   10 ++---
 src/chrome/locale/sw/torlauncher.properties        |    8 ++--
 src/chrome/locale/szl/network-settings.dtd         |   10 ++---
 src/chrome/locale/szl/torlauncher.properties       |    8 ++--
 src/chrome/locale/ta/network-settings.dtd          |   10 ++---
 src/chrome/locale/ta/torlauncher.properties        |    8 ++--
 src/chrome/locale/te-IN/network-settings.dtd       |   10 ++---
 src/chrome/locale/te-IN/torlauncher.properties     |    8 ++--
 src/chrome/locale/te/network-settings.dtd          |   10 ++---
 src/chrome/locale/te/torlauncher.properties        |    8 ++--
 src/chrome/locale/tg/network-settings.dtd          |   10 ++---
 src/chrome/locale/tg/torlauncher.properties        |    8 ++--
 src/chrome/locale/th/network-settings.dtd          |   10 ++---
 src/chrome/locale/th/torlauncher.properties        |    8 ++--
 src/chrome/locale/ti/network-settings.dtd          |   10 ++---
 src/chrome/locale/ti/torlauncher.properties        |    8 ++--
 src/chrome/locale/tk/network-settings.dtd          |   10 ++---
 src/chrome/locale/tk/torlauncher.properties        |    8 ++--
 src/chrome/locale/tr/network-settings.dtd          |   12 +++---
 src/chrome/locale/tr/progress.dtd                  |    2 +-
 src/chrome/locale/tr/torlauncher.properties        |   10 +++--
 src/chrome/locale/uk/network-settings.dtd          |   12 +++---
 src/chrome/locale/uk/torlauncher.properties        |    8 ++--
 src/chrome/locale/ur-PK/network-settings.dtd       |   10 ++---
 src/chrome/locale/ur-PK/torlauncher.properties     |    8 ++--
 src/chrome/locale/ur/network-settings.dtd          |   10 ++---
 src/chrome/locale/ur/torlauncher.properties        |    8 ++--
 src/chrome/locale/uz/network-settings.dtd          |   10 ++---
 src/chrome/locale/uz/torlauncher.properties        |    8 ++--
 src/chrome/locale/ve/network-settings.dtd          |   10 ++---
 src/chrome/locale/ve/torlauncher.properties        |    8 ++--
 src/chrome/locale/vi/network-settings.dtd          |   10 ++---
 src/chrome/locale/vi/torlauncher.properties        |    8 ++--
 src/chrome/locale/wa/network-settings.dtd          |   10 ++---
 src/chrome/locale/wa/torlauncher.properties        |    8 ++--
 src/chrome/locale/wo/network-settings.dtd          |   10 ++---
 src/chrome/locale/wo/torlauncher.properties        |    8 ++--
 src/chrome/locale/zh-CN/network-settings.dtd       |   12 +++---
 src/chrome/locale/zh-CN/progress.dtd               |    2 +-
 src/chrome/locale/zh-CN/torlauncher.properties     |   22 ++++++-----
 src/chrome/locale/zh-HK/network-settings.dtd       |   10 ++---
 src/chrome/locale/zh-HK/torlauncher.properties     |    8 ++--
 src/chrome/locale/zh-TW/network-settings.dtd       |   14 +++----
 src/chrome/locale/zh-TW/torlauncher.properties     |    8 ++--
 src/chrome/locale/zu/network-settings.dtd          |   10 ++---
 src/chrome/locale/zu/torlauncher.properties        |    8 ++--
 292 files changed, 1422 insertions(+), 1425 deletions(-)

diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ach/network-settings.dtd
+++ b/src/chrome/locale/ach/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ach/torlauncher.properties
+++ b/src/chrome/locale/ach/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ady/network-settings.dtd
+++ b/src/chrome/locale/ady/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ady/torlauncher.properties
+++ b/src/chrome/locale/ady/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/af/network-settings.dtd
+++ b/src/chrome/locale/af/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/af/torlauncher.properties
+++ b/src/chrome/locale/af/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ak/network-settings.dtd
+++ b/src/chrome/locale/ak/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ak/torlauncher.properties
+++ b/src/chrome/locale/ak/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/am/network-settings.dtd
+++ b/src/chrome/locale/am/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/am/torlauncher.properties
+++ b/src/chrome/locale/am/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index 3549bb6..7b7135b 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -2,14 +2,14 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Ø¹Ù?Ù?Ù? ØªÙ?Ù?Ù?Ø± Ù?Ø¹Ù?Ù?Ù?Ø§Øª ØÙ?Ù? Ø§ØªØµØ§Ù? Ù?Ø°Ø§ Ø§Ù?ØØ§Ø³Ø¨ Ø¨Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ø¨Ù? Ø£Ù? ØªØØ§Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© Tor.">
+<!ENTITY torsettings.prompt "Ø¹Ù?Ù?Ù? ØªÙ?Ù?Ù?Ø± Ù?Ø¹Ù?Ù?Ù?Ø§Øª ØÙ?Ù? Ø§ØªØµØ§Ù? Ù?Ø°Ø§ Ø§Ù?ØØ§Ø³Ø¨ Ø¨Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ø¨Ù? Ø£Ù? ØªØØ§Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±.">
 
 <!ENTITY torSettings.yes "Ù?Ø¹Ù?">
 <!ENTITY torSettings.no "Ù?Ø§">
 
 <!ENTITY torSettings.firstQuestion "Ø£Ù? Ù?Ù?Ø§ Ù?Ù?Ù? Ù?Ø¹ØªØ¨Ø± Ù?ØµÙ? Ø§Ù?Ø¶Ù? Ù?Ù?Ù?Ù?Ù?Ù?Ø?">
-<!ENTITY torSettings.configurePrompt1 " Ø§ØªØµØ§Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ø¨Ù?Ù?ØªØ± Ù?Ù?Ø±Ø§Ù?Ø¨Ø? Ø£Ù? Ù?ØµÙ?Ù?Ø? Ø£Ù? Ù?Ø¹Ù?Ù? Ø¨Ø¨Ø±Ù?Ù?Ø³Ù?.">
-<!ENTITY torSettings.configurePrompt2 "Ø¹Ù?Ù? ØªÙ?Ù?Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¬Ø³Ø± Ø£Ù? Ø¬Ø¯Ø§Ø± Ø§Ù?ØÙ?Ø§Ù?Ø© Ø£Ù? Ø§Ù?Ù?Ù?Ù?Ù?.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "ØªÙ?Ù?Ù?Ù?">
 <!ENTITY torSettings.connectPrompt2 "Ø£Ù?Ø¯ Ø§Ù?Ø§ØªØµØ§Ù? Ù?Ø¨Ø§Ø´Ø±Ø© Ø¥Ù?Ù? Ø´Ø¨Ù?Ø© ØªÙ?Ø±.">
 <!ENTITY torSettings.connectPrompt3 "Ø³Ù?Ù?Ù?Ø¯ Ù?Ø°Ø§ Ù?Ù? Ù?Ø¹Ø¸Ù? Ø§Ù?ØØ§Ù?Ø§Øª.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ø¥Ø°Ø§ Ù?Ù? ØªÙ?Ù? Ù?ØªØ£Ù?Ø¯Ø§ Ù?Ù? Ù?Ù?Ù?Ù?Ø© Ø§Ù?Ø¥Ø¬Ø§Ø¨Ø© Ø¹Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ø³Ø¤Ø§Ù?Ø? Ø¥Ù?Ù?Ù? Ù?Ø¸Ø±Ø© Ø¹Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ù? Ù?ØªØµÙ?Ø Ø¢Ø®Ø± ØØªÙ? ØªØªØ£Ù?Ø¯ Ø¥Ø°Ø§ Ù?Ø§Ù? Ù?Ø³ØªØ®Ø¯Ø§Ù? Ø¨Ø±Ù?Ù?Ø³Ù?.">
 <!ENTITY torSettings.enterProxy "Ø£Ø¯Ø®Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù?.">
-<!ENTITY torSettings.firewallQuestion "Ù?Ù? Ø§ØªØµØ§Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ø¨Ù?Ù?ØªØ± Ù?Ù?Ø± Ø¨Ø¬Ø¯Ø§Ø± ØÙ?Ø§Ù?Ø© Ù?Ø³Ù?Ø Ø¨Ø§Ù?Ø§ØªØµØ§Ù? Ù?Ù?Ø· Ù?Ù? Ø®Ù?Ø§Ù? Ù?Ù?Ø§Ù?Ø° Ù?Ø¹Ù?Ù?Ø©Ø?">
-<!ENTITY torSettings.firewallHelp "Ø¥Ø°Ø§ Ù?Ù? ØªÙ?Ù? Ù?ØªØ£Ù?Ø¯Ø§ Ù?Ù? Ù?Ù?Ù?Ù?Ø© Ø§Ù?Ø¥Ø¬Ø§Ø¨Ø© Ø¹Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ø³Ø¤Ø§Ù?Ø? Ø§Ø®ØªØ§Ø± Ù?Ø§. Ø¥Ø°Ø§ Ù?Ø§Ø¬Ù?ØªÙ? Ù?Ø´Ø§Ù?Ù? Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±, ØºÙ?Ù?Ø± Ù?Ø°Ø§ Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯.">
-<!ENTITY torSettings.enterFirewall "Ø¥Ø¯Ø®Ù? Ù?Ø§Ø¦Ù?Ø© Ù?Ù?ØµÙ?Ù?Ø© Ø¨Ù?Ù?Ø§ØµÙ? Ù?Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø° Ø§Ù?ØªÙ? Ù?Ø³Ù?Ø Ø¨Ù?Ø§ Ø¬Ø¯Ø§Ø± Ø§Ù?ØÙ?Ø§Ù?Ø©.">
 <!ENTITY torSettings.bridgeQuestion "Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ù?Ø¯Ù? Ø®Ø¯Ù?Ø© Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª (ISP) Ø§Ù?Ø°Ù? ØªØªØ¹Ø§Ù?Ù? Ù?Ø¹Ù? Ø¨ØØ¬Ø¨ Ø§Ù?Ø§ØªØµØ§Ù?Ø§Øª Ø¨Ø´Ø¨Ù?Ø© Tor Ø£Ù? Ù?Ø±Ø§Ù?Ø¨ØªÙ?Ø§ Ø¨Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù?Ø?">
 <!ENTITY torSettings.bridgeHelp "Ø¥Ø°Ø§ Ù?Ù? ØªÙ?Ù? Ù?ØªØ£Ù?Ø¯Ø§ Ù?Ù? Ø¥Ø¬Ø§Ø¨Ø© Ù?Ø°Ø§ Ø§Ù?Ø³Ø¤Ø§Ù?Ø? Ù?Ù? Ø¨Ø§Ø®ØªÙ?Ø§Ø± Ù?Ø§. &#160; Ø¥Ø°Ø§ Ù?Ù?Øª Ø¨Ø§Ø®ØªÙ?Ø§Ø± Ù?Ø¹Ù?Ø? Ù?Ø³Ù?Ø·Ù?Ø¨ Ù?Ù?Ù? ØªÙ?Ù?Ù?Ù? Ø¬Ø³Ù?Ø± Tor Ù?Ø§Ù?ØªÙ? Ù?Ù? Ù?Ù?Ø§Ù?Ø° ØªØ±ØÙ?Ù? ØºÙ?Ø± Ù?Ø¯Ø±Ø¬Ø© ØªØµØ¹Ø¨ Ø¹Ù?Ù?Ù?Ø© ØØ¸Ø± Ø§Ù?Ø§ØªØµØ§Ù?Ø§Øª Ø¨Ø´Ø¨Ù?Ø© Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Ù?Ù?Ù?Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ø¬Ù?Ù?Ø¹Ø© Ø§Ù?Ø¬Ø³Ù?Ø± Ø§Ù?Ù?ØªÙ?Ù?Ø±Ø© Ø£Ù? Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ù?Ø¬Ù?Ù?Ø¹Ø© Ù?Ø®ØµØµØ© Ù?Ù? Ø§Ù?Ø¬Ø³Ù?Ø±.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Ù?Ù? Ø®Ù?Ø§Ù? Ø§Ù?Ù?Ù?Ø¨">
 <!ENTITY torsettings.bridgeHelp2 "Ø§Ø³ØªØ®Ø¯Ù? Ù?ØªØµÙ?Ø Ù?Ù?Ø¨ Ù?Ø²Ù?Ø§Ø±Ø© https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Ù?Ù? Ø®Ù?Ø§Ù? Ø§Ù?Ù?Ø³ØªØ¬Ù?Ø¨ Ø§Ù?ØªÙ?Ù?Ø§Ø¦Ù? Ù?Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?">
-<!ENTITY torsettings.bridgeHelp3 "Ø§Ø±Ø³Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? bridges@xxxxxxxxxxxxxx Ù?ØØªÙ?Ù? Ø¹Ù?Ù? 'get bridges' Ù?Ù? Ù?Ù?Ø¨ Ø§Ù?Ø¨Ø±Ù?Ø¯. Ù? ØØªÙ? ØªØ¶Ù?Ù? Ù?ØµÙ?Ù? Ø°Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ù?Ù?Ø§ Ø¨Ù?Ø¬Ø§Ø Ø§Ø³ØªØ®Ø¯Ù? Ø¥Ù?Ø§ gmail.com Ø£Ù? yahoo.com">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Ø§Ø±Ø³Ù? Ø±Ø³Ø§Ù?Ù? Ø§Ù?Ù? bridges@xxxxxxxxxxxxxx Ù?Ø¹ Ø§Ù?Ø¹Ø¨Ø§Ø±Ù? &quot;get bridges&quot; Ù?Ù? Ù?Ø³Ø· Ø§Ù?ØµÙ?ØÙ? .&amp;#160 , Ù?Ù?Ù?Ù? Ø¨Ø£Ù?Ù?Ø§Ù?Ù? Ø§Ù? ØªØ¬Ø¹Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ù? Ø§Ù?Ø«Ø± Ø§Ù?Ù?Ø§Ù? Ù? Ù?Ø³ØªØµØ¹Ø¨Ù? Ù?Ù?Ù?Ø®ØªØ±Ù? (Ø§Ù?Ù?Ø§Ù?Ø±) Ø§Ù? Ù?Ø±Ø§Ù?Ø§ Ø¹Ù? Ø·Ø±Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ø±Ù?Ø¯ Ø§Ù?Ù?Ø´Ù?Ù?Ø±Ù? Gmail Ù? Yahoo ">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net Ø§Ù? https://mail.google.com, Ø§Ù? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Ù?Ù? Ø®Ù?Ø§Ù? Ù?Ù?ØªØ¨ Ø§Ù?Ù?Ø³Ø§Ø¹Ø¯Ø©">
 <!ENTITY torsettings.bridgeHelp4 "Ù?Ù?Ù?Ù?Ù? Ø·Ù?Ø¨ Ø¹Ù?Ø§Ù?Ù?Ù? Ø§Ù?Ø¬Ø³Ø±Ø? Ù?ØÙ? Ø£Ø®Ù?Ø±Ø? Ù?Ù? Ø®Ù?Ø§Ù? Ø¥Ø±Ø³Ø§Ù? Ø±Ø³Ø§Ù?Ø© Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ù?Ù?Ø°Ø¨Ø© Ø¥Ù?Ù? help@xxxxxxxxxxxxxxxxxx&#160; Ù?Ø±Ø¬Ù? Ù?Ù?Ø§ØØ¸Ø© Ø£Ù?Ù? Ù?Ø¬Ø¨ Ø£Ù? Ù?Ø±Ø¯ Ø´Ø®Øµ Ù?Ø§ Ø¹Ù?Ù? Ù?Ù? Ø·Ù?Ø¨.">
diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties
index 1a1882a..1138a57 100644
--- a/src/chrome/locale/ar/torlauncher.properties
+++ b/src/chrome/locale/ar/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Ù?Ù?Ø´ØºÙ? ØªÙ?Ø±
 
-torlauncher.tor_exited=ØªÙ?Ù?Ù? ØªÙ?Ø± Ø¹Ù? Ø§Ù?Ø¹Ù?Ù? Ø¨Ø´Ù?Ù? ØºÙ?Ø± Ù?ØªÙ?Ù?Ø¹.
-torlauncher.tor_connection_lost=Ù?Ø¯ ØªÙ? Ù?Ù?Ø¯Ù? Ø§ØªØµØ§Ù?Ù? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Ø§Ø¹Ø§Ø¯Ø© ØªØ´ØºÙ?Ù? ØªÙ?Ø± Ù?Ø§ Ù?ØºÙ?Ù? Ø§Ù?ØµÙ?ØØ§Øª.
 torlauncher.tor_controlconn_failed=ØªØ¹Ø°Ø± Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ù?Ù?Ù?Ø° Ø§Ù?ØªØÙ?Ù? Ø§Ù?Ø®Ø§Øµ Ø¨ØªÙ?Ø±.
 torlauncher.tor_failed_to_start=ØªÙ?Ø± Ù?Ø´Ù? Ù?Ù? Ø¨Ø¯Ø¡ Ø§Ù?ØªØ´ØºÙ?Ù?.
 torlauncher.tor_control_failed=ØªØ¹Ø°Ø± Ø§Ù?ØªØÙ?Ù? Ù?Ù? ØªÙ?Ø±.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ø¹ ØºÙ?Ø± Ù?ØªÙ?Ù?Ø± Ø¨
 torlauncher.recommended_bridge=(Ù?Ù?ØµÙ? Ø¨Ù?)
 
 torlauncher.connect=Ø§ØªØµÙ?
-torlauncher.reconnect=Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù?Ø¥ØªØµØ§Ù?
+torlauncher.restart_tor=Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙ?Ù? ØªÙ?Ø±
 torlauncher.quit=Ø¥Ù?Ù?Ø§Ø¡
 torlauncher.quit_win=Ø®Ø±Ù?Ø¬
 torlauncher.done=ØªÙ?
 
 torlauncher.forAssistance=Ù?Ù?Ù?Ø³Ø§Ø¹Ø¯Ø©, Ø§ØªØµÙ? Ø¨Ù? %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Ø¬Ø§Ø±Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø¯Ù?Ù?Ù? Ø§Ù?ØªØÙ?Ù?Ù?Ø§Øª
 torlauncher.bootstrapStatus.handshake_dir=Ù?Ù?Ø´Ø¦ Ø§ØªØµØ§Ù?Ø§ Ù?Ø´Ù?Ø±Ø§ Ø¨Ø§Ù?Ø¯Ù?Ù?Ù?
 torlauncher.bootstrapStatus.requesting_status=Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? ØØ§Ù?Ø© Ø§Ù?Ø´Ø¨Ù?Ø©
diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/arn/network-settings.dtd
+++ b/src/chrome/locale/arn/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/arn/torlauncher.properties
+++ b/src/chrome/locale/arn/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd
index 028263c..a97dd47 100644
--- a/src/chrome/locale/ast/network-settings.dtd
+++ b/src/chrome/locale/ast/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Non">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ast/torlauncher.properties
+++ b/src/chrome/locale/ast/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd
index b9ca7d7..3cf2d1d 100644
--- a/src/chrome/locale/az/network-settings.dtd
+++ b/src/chrome/locale/az/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Xeyr">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties
index b59761b..a70b15b 100644
--- a/src/chrome/locale/az/torlauncher.properties
+++ b/src/chrome/locale/az/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Ã?Ä±x
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd
index f46473e..352d7c9 100644
--- a/src/chrome/locale/be/network-settings.dtd
+++ b/src/chrome/locale/be/network-settings.dtd
@@ -4,12 +4,12 @@
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
-<!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "No">
+<!ENTITY torSettings.yes "Ð¢Ð°Ðº">
+<!ENTITY torSettings.no "Ð?Ðµ">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -39,7 +36,7 @@
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
 <!ENTITY torsettings.useProxy.port "Port:">
 <!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.password "Ð?Ð°Ñ?Ð¾Ð»Ñ?:">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/be/torlauncher.properties
+++ b/src/chrome/locale/be/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd
index f8f6c79..27ae588 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ð?Ðµ">
 
 <!ENTITY torSettings.firstQuestion "Ð?Ð¾Ðµ Ð¾Ñ? Ñ?Ð»ÐµÐ´Ð½Ð¸Ñ?Ðµ Ð¾Ð¿Ð¸Ñ?Ð²Ð° Ð½Ð°Ð¹-Ð´Ð¾Ð±Ñ?Ðµ Ð²Ð°Ñ?Ð°Ñ?Ð° Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ñ??">
-<!ENTITY torSettings.configurePrompt1 "Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ð½Ð° Ñ?Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð°,Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¸Ð»Ð¸ Ð¿Ñ?ÐµÐ¼Ð¸Ð½Ð°Ð²Ð° Ð¿Ñ?ÐµÐ· Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ð¹">
 <!ENTITY torSettings.connectPrompt2 "Ð?Ð¸Ñ? Ð¸Ñ?ÐºÐ°Ð» Ð´Ð° Ñ?Ðµ Ñ?Ð²Ñ?Ñ?Ð¶Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ ÐºÑ?Ð¼ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°.">
 <!ENTITY torSettings.connectPrompt3 "Ð¢Ð¾Ð²Ð° Ñ?Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸ Ð¿Ñ?Ð¸ Ð¿Ð¾Ð²ÐµÑ?ÐµÑ?Ð¾ Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ð¸.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ð?ÐºÐ¾ Ð½Ðµ Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸ ÐºÐ°Ðº Ð´Ð° Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ñ?Ð¾Ð·Ð¸ Ð²Ñ?Ð¿Ñ?Ð¾Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÑ?Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð½Ð° Ð´Ñ?Ñ?Ð³ Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?,Ð·Ð° Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ?Ðµ Ð´Ð°Ð»Ð¸ Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐ½ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
 <!ENTITY torSettings.enterProxy "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
-<!ENTITY torSettings.firewallQuestion "Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ð½Ð° Ñ?Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¸Ð½Ð°Ð²Ð° Ð»Ð¸ Ð¿Ñ?ÐµÐ· firewall,ÐºÐ¾Ð¹Ñ?Ð¾ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?Ð²Ð° Ð²Ñ?Ñ?Ð·ÐºÐ¸ ÐºÑ?Ð¼ Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ðµ?">
-<!ENTITY torSettings.firewallHelp "Ð?ÐºÐ¾ Ð½Ðµ Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸ ÐºÐ°Ðº Ð´Ð° Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð²Ñ?Ð¿Ñ?Ð¾Ñ?Ð°,Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð?Ðµ.Ð?ÐºÐ¾ Ñ?Ñ?ÐµÑ?Ð½ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ ÐºÑ?Ð¼ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½ÐµÑ?Ðµ Ñ?ÐµÐ·Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸.">
-<!ENTITY torSettings.enterFirewall "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ñ?Ð¿Ð¸Ñ?Ñ?Ðº Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ðµ Ñ?Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸ Ñ?Ñ?Ñ? Ð·Ð°Ð¿ÐµÑ?Ð°Ñ?,ÐºÐ¾Ð¸Ñ?Ð¾ Ñ?Ð° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸ Ð¾Ñ? firewall.">
 <!ENTITY torSettings.bridgeQuestion "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð°Ð½Ð¸ Ð¸Ð»Ð¸ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ð»Ð¸ Ñ?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ¸Ñ?Ðµ ÐºÑ?Ð¼ Tor Ð?Ñ?ÐµÐ¶Ð°Ñ?Ð° Ð¾Ñ? Ð²Ð°Ñ?Ð¸Ñ?Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº(ISP)?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Ð?Ñ?ÐµÐ· Web">
 <!ENTITY torsettings.bridgeHelp2 "Ð?Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹Ñ?Ðµ Ñ?ÐµÐ± Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ? Ð·Ð° Ð´Ð° Ð¿Ð¾Ñ?ÐµÑ?Ð¸Ñ?Ðµ https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties
index 9073054..2363674 100644
--- a/src/chrome/locale/bg/torlauncher.properties
+++ b/src/chrome/locale/bg/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Ð¢Ð¾Ñ? Ð»Ñ?Ð½Ñ?ÐµÑ?
 
-torlauncher.tor_exited=Ð¢Ð¾Ñ? Ñ?Ð¿Ñ?Ñ? Ð¿Ñ?Ð¸Ð½Ñ?Ð´Ð¸Ñ?ÐµÐ»Ð½Ð¾
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Ð¢Ð¾Ñ? Ð½Ñ?Ð¼Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° Ñ? ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?
 torlauncher.tor_failed_to_start=Ð¢Ð¾Ñ? Ð½Ðµ Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð¾
 torlauncher.tor_control_failed=Ð?ÐµÑ?Ñ?Ð¿Ñ? Ð´Ð° Ð¿Ð¾ÐµÐ¼Ðµ ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð» Ð½Ð°Ð´ Ð¢Ð¾Ñ?.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Ð?Ð¸ÐºÐ¾Ð¹ Ð¾Ñ? Ð¸Ð·Ð±Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð¼
 torlauncher.recommended_bridge=(Ð¿Ñ?ÐµÐ¿Ð¾Ñ?Ñ?Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¾)
 
 torlauncher.connect=Ð¡Ð²Ñ?Ñ?Ð¶Ð¸ Ñ?Ðµ
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Ð?Ñ?Ð°Ð¹
 torlauncher.quit_win=Ð?Ð·Ñ?Ð¾Ð´
 torlauncher.done=Ð?Ð¾Ñ?Ð¾Ð²Ð¾
 
 torlauncher.forAssistance=Ð?Ð° Ñ?Ñ?Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ , Ð¼Ð¾Ð»Ñ? Ñ?Ð²Ñ?Ñ?Ð¶ÐµÑ?Ðµ Ñ?Ðµ Ñ? %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Ð¡Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ Ñ? Ð¿Ñ?ÐµÐ¿Ñ?ÐµÐ´Ð°Ð²Ð°Ñ?Ð°Ñ?Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?
 torlauncher.bootstrapStatus.handshake_dir=Ð?Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° Ñ? ÐºÑ?Ð¸Ð¿Ñ?Ð¸Ñ?Ð°Ð½Ð°Ñ?Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?
 torlauncher.bootstrapStatus.requesting_status=Ð?Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð° Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°
diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/bn-IN/network-settings.dtd
+++ b/src/chrome/locale/bn-IN/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/bn-IN/torlauncher.properties
+++ b/src/chrome/locale/bn-IN/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd
index 21754aa..3e6b70c 100644
--- a/src/chrome/locale/bn/network-settings.dtd
+++ b/src/chrome/locale/bn/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties
index f77c6fe..c745e20 100644
--- a/src/chrome/locale/bn/torlauncher.properties
+++ b/src/chrome/locale/bn/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/bo/network-settings.dtd
+++ b/src/chrome/locale/bo/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/bo/torlauncher.properties
+++ b/src/chrome/locale/bo/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/br/network-settings.dtd
+++ b/src/chrome/locale/br/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties
index 306f505..5860c8a 100644
--- a/src/chrome/locale/br/torlauncher.properties
+++ b/src/chrome/locale/br/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(erbedet)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd
index 8dccace..8f9ec4d 100644
--- a/src/chrome/locale/bs/network-settings.dtd
+++ b/src/chrome/locale/bs/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ne">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/bs/torlauncher.properties
+++ b/src/chrome/locale/bs/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd
index 638d506..a29491f 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Quina de les segÃ¼uens descriula teva situaciÃ³?">
-<!ENTITY torSettings.configurePrompt1 "La connexiÃ³ a internet d'aquest ordinador estÃ  censurada, filtrada o usa Proxys">
-<!ENTITY torSettings.configurePrompt2 "Necessito configurar un pont, el tallafocs o els parÃ metres del proxy.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configura">
 <!ENTITY torSettings.connectPrompt2 "M'agradaria conectar-me directament a la xarxa Tor.">
 <!ENTITY torSettings.connectPrompt3 "AixÃ² funciona en la majoria dels casos.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Si no estas segur de com respondre a aquesta pregunta, observa els parÃ metres d'Internet en un altre navegador per veure si estÃ  configurat per utilitzar un proxy.">
 <!ENTITY torSettings.enterProxy "Introdueix les opcions del proxy.">
-<!ENTITY torSettings.firewallQuestion "La connexiÃ³ d'aquest ordinador va a travÃ©s d'un firewall que nomÃ©s permet les connexions per certs ports?">
-<!ENTITY torSettings.firewallHelp "Si no estas segur de com respondre a aquesta pregunta, selecciona no. Si tens problemes de connexiÃ³ per la xarxa Tor, canvia aquest parÃ metre.">
-<!ENTITY torSettings.enterFirewall "Escriviu una llista separada per comes dels ports que estan permesos pel proxy.">
 <!ENTITY torSettings.bridgeQuestion "El vostre proveÃ¯dor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Hauries d'utilitzar el set de repetidors provist o customitzar el teu propi.">
@@ -60,6 +57,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "A travÃ©s del web">
 <!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vÃ©s a: https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "A travÃ©s del mail d'autorresposta.">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "A travÃ©s del Escriptori d'Ajuda">
 <!ENTITY torsettings.bridgeHelp4 "Com a Ãºltima opciÃ³, pots demanar adreces de repetidors enviant un missatge a help@xxxxxxxxxxxxxxxxxx&#160; siusplau recorda que serÃ  una persona qui et respondrÃ , siguis pacient i amable.">
diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties
index 161efa0..636fe1b 100644
--- a/src/chrome/locale/ca/torlauncher.properties
+++ b/src/chrome/locale/ca/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Inicialitzador Tor
 
-torlauncher.tor_exited=Tor ha sortit inesperadament.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No hi ha ponts subministrats que tingu
 torlauncher.recommended_bridge=(recomanat)
 
 torlauncher.connect=Conectar
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Surt
 torlauncher.quit_win=Surt
 torlauncher.done=Fet
 
 torlauncher.forAssistance=Per assistÃ¨ncia, contacta %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=S'estÃ  establint una connexiÃ³ a un directori xifrat
 torlauncher.bootstrapStatus.requesting_status=S'estÃ  rebent l'estat de la xarxa
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index ff97202..4059981 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ne">
 
 <!ENTITY torSettings.firstQuestion "KterÃ¡ moÅ¾nost nejlÃ©pe popisuje VaÅ¡i situaci?">
-<!ENTITY torSettings.configurePrompt1 "Toto pÅ?ipojenÃ poÄ?ÃtaÄ?e k internetu je cenzurovÃ¡no, filtrovÃ¡no, nebo zprostÅ?edkovÃ¡no.">
-<!ENTITY torSettings.configurePrompt2 "PotÅ?ebuji nastavit sÃÅ¥ovÃ½ most, firewall, nebo nastavnÃ proxy.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Konfigurovat">
 <!ENTITY torSettings.connectPrompt2 "ChtÄ?l bych se pÅ?Ãmo pÅ?ipojit k Tor sÃti.">
 <!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve vÄ?tÅ¡inÄ? pÅ?ÃpadÅ¯.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Jestli nevÃte jak odpovÄ?dÄ?t na tuto otÃ¡zku, podÃvejte se na internetovÃ© nastavenÃ v jinÃ©m prohlÃÅ¾eÄ?i, aby jste zjistili, zda je nakonfigurovÃ¡n k pouÅ¾itÃ proxy.">
 <!ENTITY torSettings.enterProxy "Zadejte nastavenÃ serveru proxy.">
-<!ENTITY torSettings.firewallQuestion "Je poÄ?ÃtaÄ? pÅ?ipojen k internetu pÅ?es firewall, kterÃ½ povoluje pÅ?ipojenÃ pouze pÅ?es nÄ?kterÃ© porty?">
-<!ENTITY torSettings.firewallHelp "Jestli si nejste jisti, jak odpovÄ?dÄ?t na otÃ¡zku, odpovÄ?zte NE. JestliÅ¾e narazÃte na problÃ©my s pÅ?ipojenÃm k Tor sÃti, zmÄ?Å?te toto nastavenÃ.">
-<!ENTITY torSettings.enterFirewall "Zadejte Ä?Ã¡rkami oddÄ?lenÃ½ seznam portÅ¯, kterÃ© jsou povoleny firewallem.">
 <!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje vÃ¡Å¡ poskytovatel internetovÃ©ho pÅ?ipojenÃ (ISP) spojenÃ se sÃtÃ TORu?">
 <!ENTITY torSettings.bridgeHelp "Pokud si nejste jistÃ jak odpovÄ?dÄ?t na tuto otÃ¡zku, zvolte No.&#160; Pokud vyberete Ano, budete vyzvÃ¡ni k nastavenÃ MostÅ¯ TORu, coÅ¾ jsou pÅ?enaÅ¡eÄ?e neuvedenÃ© v seznamu, kterÃ© dÄ?lajÃ blokovÃ¡nÃ spojenÃ se sÃtÃ TORu sloÅ¾itÄ?jÅ¡Ã.">
 <!ENTITY torSettings.bridgeSettingsPrompt "MÅ¯Å¾ete pouÅ¾Ãt poskytnutou sadu sÃÅ¥ovÃ½ch mostÅ¯ nebo mÅ¯Å¾ete zÃskat a zadat vlastnÃ sadu.">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ä?ekÃ¡nÃ na start TORu">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Restartovat Tor">
 
 <!ENTITY torsettings.optional "VolitelnÃ½">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "PÅ?es sÃÅ¥">
 <!ENTITY torsettings.bridgeHelp2 "PouÅ¾ijte internetovÃ½ prohlÃÅ¾eÄ? k nÃ¡vÅ¡tÄ?vÄ? https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "PÅ?es automatickÃ½ e-mailovÃ½ odpovÃdaÄ?">
-<!ENTITY torsettings.bridgeHelp3 "PoÅ¡lete e-mail na bridges@xxxxxxxxxxxxxx s vÄ?tou 'get bridges' jako takovou v tÄ?le zprÃ¡vy.&#160; NicmÃ©nÄ? abychom ztÃÅ¾ili ÃºtoÄ?nÃkovi zjiÅ¡tÄ?nÃ spousty adres, musÃte tento poÅ¾adavek poslat z e-mailovÃ© adresy gmail.com nebo yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "PÅ?es zÃ¡kaznickou linku">
 <!ENTITY torsettings.bridgeHelp4 "Jako poslednÃ Å?eÅ¡enÃ si mÅ¯Å¾ete vyÅ¾Ã¡dat adresy sÃÅ¥ovÃ½ch mostÅ¯ tak, Å¾e zaÅ¡lete sluÅ¡nÃ½ e-mail na help@xxxxxxxxxxxxxxxxxx&#160; VezmÄ?te v Ãºvahu si prosÃm, Å¾e na kaÅ¾dÃ½ poÅ¾adavek musÃ odpovÄ?dÄ?t Ä?lovÄ?k.">
diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties
index caa3810..48114f5 100644
--- a/src/chrome/locale/cs/torlauncher.properties
+++ b/src/chrome/locale/cs/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor spouÅ¡tÄ?Ä?
 
-torlauncher.tor_exited=Tor znenadÃ¡nÃ skonÄ?il.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor byl neoÄ?ekÃ¡vanÄ? ukonÄ?en. To by mohlo bÃ½t zpÅ¯sobeno chybou v Toru, jinÃ©m programu na vaÅ¡em systÃ©mu, nebo vadnÃ½m hardware. Dokud nerestartujete Tor, nebude Tor Browser schopen dosÃ¡hnout jakÃ©koli webovÃ© strÃ¡nky. Pokud problÃ©m pÅ?etrvÃ¡vÃ¡, prosÃm poÅ¡lete tÃ½mu podpory kopii souboru Tor Logu.
+torlauncher.tor_exited2=RestartovÃ¡nÃ Tor nebude zavÃrat zÃ¡loÅ¾ky prohlÃÅ¾eÄ?e.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Nejsou zadanÃ© Å¾Ã¡dnÃ© bridge, kterÃ©
 torlauncher.recommended_bridge=(doporuÄ?eno)
 
 torlauncher.connect=PÅ?ipojit
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restartovat Tor
 torlauncher.quit=Ukoncit
 torlauncher.quit_win=Konec
 torlauncher.done=Hotovo
 
 torlauncher.forAssistance=Pro asistenci kontaktujte %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=PÅ?ipojovÃ¡nÃ do adresÃ¡Å?e uzlu
 torlauncher.bootstrapStatus.handshake_dir=Navazuji spojenÃ s Å¡ifrovanÃ½m adresÃ¡Å?em
 torlauncher.bootstrapStatus.requesting_status=ZjiÅ¡Å¥uji stav sÃtÄ?
diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/csb/network-settings.dtd
+++ b/src/chrome/locale/csb/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/csb/torlauncher.properties
+++ b/src/chrome/locale/csb/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd
index 8551533..c8a555d 100644
--- a/src/chrome/locale/cv/network-settings.dtd
+++ b/src/chrome/locale/cv/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ã?Ñ?Ðº">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties
index b68511b..f55f173 100644
--- a/src/chrome/locale/cv/torlauncher.properties
+++ b/src/chrome/locale/cv/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Ã?Ñ?Ñ?Ä?Ð½Ñ?Ð°Ñ?
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd
index 9525451..541f1cd 100644
--- a/src/chrome/locale/cy/network-settings.dtd
+++ b/src/chrome/locale/cy/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Na">
 
 <!ENTITY torSettings.firstQuestion "Pa un o'r canlynol sy'n disgrifio'ch sefyllfa orau?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "Mae angen i mi ffurweddu pont, mur gwarchod, neu osodiadau dirprwy.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Ffurfweddu">
 <!ENTITY torSettings.connectPrompt2 "Hoffwn gysylltu'n uniongyrchol Ã¢ rhwydwaith Tor.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Rhowch osodiadau'r dirprwy.">
-<!ENTITY torSettings.firewallQuestion "A yw cysylltiad Rhyngrwyd y cyfrifiadur hwn yn mynd trwy mur gwarchod sy'n caniatau cysylltiadau i rai pyrth penodol?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties
index 2fce140..5119e81 100644
--- a/src/chrome/locale/cy/torlauncher.properties
+++ b/src/chrome/locale/cy/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Lansiwr Tor
 
-torlauncher.tor_exited=Gadawodd Tor ar hap.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Does ddim pontiau a ddatparwyd gyda'r
 torlauncher.recommended_bridge=(awgrymwyd)
 
 torlauncher.connect=Cysylltu
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Cau
 torlauncher.quit_win=Gadael
 torlauncher.done=Wedi gorffen
 
 torlauncher.forAssistance=Am gymorth, cysylltu Ã¢ %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Cysylltu i cyfeiriadur cyfnewid
 torlauncher.bootstrapStatus.handshake_dir=Yn sefydlu cysylltiad cyfeiriadur amgryptiedig
 torlauncher.bootstrapStatus.requesting_status=Yn adalw statws y rhwydwaith
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index da32cfc..0c8817a 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nej">
 
 <!ENTITY torSettings.firstQuestion "Hvilke af de fÃ¸lgende beskriver bedst din situation?">
-<!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret, filtreret, eller fÃ¸res igennem en proxy.">
-<!ENTITY torSettings.configurePrompt2 "Jeg Ã¸nsker at konfigurere bro, firewall eller proxy indstillinger">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Indstil">
 <!ENTITY torSettings.connectPrompt2 "Jeg vil forbinde direkte til Tor netvÃ¦rket.">
 <!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Hvis du ikke kender svaret pÃ¥ dette spÃ¸rgsmÃ¥l, sÃ¥ kig pÃ¥ internetindstillingerne i en anden browser for at se om den er konfigureret til at bruge en proxy.">
 <!ENTITY torSettings.enterProxy "Indtast proxy-indstillinger.">
-<!ENTITY torSettings.firewallQuestion "GÃ¥r denne computers internetforbindelse igennem en firewall som kun tillader forbindelse til visse porte?">
-<!ENTITY torSettings.firewallHelp "Hvis du ikke er sikker pÃ¥ hvordan du skal svare pÃ¥ dette spÃ¸rgsmÃ¥l, vÃ¦lg Nej. Hvis du lÃ¸ber ind i problemer med at forbinde til Tor netvÃ¦rket, skal du Ã¦ndre denne indstilling.">
-<!ENTITY torSettings.enterFirewall "Indtast en komma-separeret liste over porte der er tilladt pÃ¥ firewallen.">
 <!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor netvÃ¦rket?">
 <!ENTITY torSettings.bridgeHelp "Hvis du er usikker pÃ¥ svaret til dette spÃ¸rgsmÃ¥l, vÃ¦lg No.&#160; Hvis du vÃ¦lger Ja, vil du blive bedt om at konfigurere Tor Broer, der er ulistede relays, som gÃ¸r det svÃ¦rere at blokere forbindelser til Tor NetvÃ¦rket.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruge det tildelte sÃ¦t broer eller du kan hente og indtaste et skrÃ¦ddersyet sÃ¦t broer.">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Venter pÃ¥ at Tor starter...">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Genstart Tor">
 
 <!ENTITY torsettings.optional "Valgfri">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "PÃ¥ nettet">
 <!ENTITY torsettings.bridgeHelp2 "Brug en browser og besÃ¸g https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske email service">
-<!ENTITY torsettings.bridgeHelp3 "Send en email til bridges@xxxxxxxxxxxxxx kun bestÃ¥ende af linjen 'get bridges' i indholdet.&#160;  For at gÃ¸re det svÃ¦rere at fÃ¥ kendskab til alle bro adresser med henblik pÃ¥ blokering er det kun muligt at sende fra en gmail.com eller yahoo.com email adresse.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at fÃ¥ en bro adresse tilsendt ved at sende en venlig email to help@xxxxxxxxxxxxxxxxxx&#160; BemÃ¦rk venligst at alle emails besvares manuelt.">
diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties
index 12bb8af..2d356fc 100644
--- a/src/chrome/locale/da/torlauncher.properties
+++ b/src/chrome/locale/da/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor starter
 
-torlauncher.tor_exited=Tor lukkede uventet.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttype
 torlauncher.recommended_bridge=(Anbefalet)
 
 torlauncher.connect=Tilslut
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Genstart Tor
 torlauncher.quit=Afslut
 torlauncher.quit_win=Afslut
 torlauncher.done=FÃ¦rdig
 
 torlauncher.forAssistance=For hjÃ¦lp, kontakt %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Tilslutter til relÃ¦ mappe
 torlauncher.bootstrapStatus.handshake_dir=Opretter en krypteret mappe forbindelse
 torlauncher.bootstrapStatus.requesting_status=Henter netvÃ¦rk status
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index 1409260..2ccb333 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nein">
 
 <!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?">
-<!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert, gefiltert oder vermittelt.">
-<!ENTITY torSettings.configurePrompt2 "Ich muss die Einstellungen der BrÃ¼cke, der Firewall oder des Vermittlungsservers einstellen.">
+<!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert oder vermittelt.">
+<!ENTITY torSettings.configurePrompt2 "Ich muss die BrÃ¼cken- und Vermittlungsservereinstellungen konfigurieren.">
 <!ENTITY torSettings.configure "Konfigurieren">
 <!ENTITY torSettings.connectPrompt2 "Ich wÃ¼rde gerne direkt eine Verbindung zum Tor-Netzwerk herstellen.">
 <!ENTITY torSettings.connectPrompt3 "Das wird in den meisten Situationen funktionieren.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Wenn Sie sich nicht sicher sind, dann schauen Sie in die Einstellungen ihres normalen Browsers ob dort ein Vermittlungsserver eingerichtet ist.">
 <!ENTITY torSettings.enterProxy "Vermittlungseinstellungen eingeben.">
-<!ENTITY torSettings.firewallQuestion "Benutzt die Internetverbindung dieses Rechners eine Firewall, die nur Verbindungen zu bestimmten AnschlÃ¼ssen zulÃ¤sst?">
-<!ENTITY torSettings.firewallHelp "Wenn Sie sich nicht sicher sind, wÃ¤hlen Sie Nein. Wenn Sie dann Probleme haben eine Verbindung zum Tor-Netzwerk herzustellen, Ã¤ndern Sie diese Einstellung.">
-<!ENTITY torSettings.enterFirewall "Geben Sie hier die AnschlÃ¼sse ein, die von der Firewall erlaubt werden. Trennen Sie die AnschlÃ¼sse jeweils mit einem Komma.">
 <!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?">
 <!ENTITY torSettings.bridgeHelp "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, wÃ¤hlen Sie Nr.&#160; Wenn Sie Ja wÃ¤hlen, werden Sie aufgefordert, die TorbrÃ¼cken zu konfigurieren. Die nicht aufgefÃ¼hrte Relais sind, was es schwieriger macht, Verbindungen zum Tor-Netzwerk zu blockieren.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Sie kÃ¶nne den bereitgestellten Satz an BrÃ¼cken verwenden oder Sie kÃ¶nnen welche erhalten, und geben einen benutzerdefinierten Satz an BrÃ¼cken ein.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet">
 <!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort">
-<!ENTITY torsettings.bridgeHelp3 "Schreiben Sie eine E-Mail an bridges@xxxxxxxxxxxxxx mit dem Nachrichteninhalt Â»get bridgesÂ«.&#160; Doch um es schwieriger fÃ¼r einen Angreifer zu machen, eine Menge von BrÃ¼ckenadressen zu erfahren, mÃ¼ssen Sie diese Anfrage von einer gmail.com oder yahoo.com E-Mail-Adresse schicken.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Schicken Sie eine E-Mail mit dem Text 'get bridges' an bridges@xxxxxxxxxxxxxxx Um Missbrauch durch das Auslesen groÃ?er Mengen an BrÃ¼cken zu erschweren, muss Ihre Anfrage jedoch von einer der folgenden E-Mail Anbieter kommen:">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, oder https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle">
 <!ENTITY torsettings.bridgeHelp4 "BrÃ¼ckenadressen kÃ¶nnen auch mit Hilfe einer hÃ¶flichen E-Mail an help@xxxxxxxxxxxxxxxxx angefordert werden.&#160; Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss.">
diff --git a/src/chrome/locale/de/progress.dtd b/src/chrome/locale/de/progress.dtd
index 45bd6d6..3386f46 100644
--- a/src/chrome/locale/de/progress.dtd
+++ b/src/chrome/locale/de/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor-Status">
 <!ENTITY torprogress.openSettings "Einstellungen Ã¶ffnen">
-<!ENTITY torprogress.heading "Mit dem Tor-Netzwerk verbinden">
-<!ENTITY torprogress.pleaseWait "Bitte warten Sie wÃ¤hrend die Verbindung zum Tor-Netzwerk hergestellt wird.">
+<!ENTITY torprogress.heading "Mit dem Tor-Netzwerk wird verbinden">
+<!ENTITY torprogress.pleaseWait "Bitte warten, wÃ¤hrend die Verbindung zum Tor-Netzwerk hergestellt wird.">
diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties
index 7ef626d..5dc89c9 100644
--- a/src/chrome/locale/de/torlauncher.properties
+++ b/src/chrome/locale/de/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor-Starter
 
-torlauncher.tor_exited=Tor wurde unerwartet geschlossen.
-torlauncher.tor_connection_lost=Ihre Verbindung zum Tor-Netzwerk ist verloren gegangen.
+torlauncher.tor_exited=Tor wurde unerwartet beendet. Das kann an einem Fehler von Tor selbst, an einem anderen Programm auf ihrem System oder fehlerhaften GerÃ¤ten liegen. Bis Sie Tor neu starten, kann der Tor-Browser keine Internetseiten mehr erreichen. Wenn das Problem bestehen bleibt, bitte eine Kopie des Tor-Protokolls an die UnterstÃ¼tzungsmannschaft senden.
+torlauncher.tor_exited2=Das Neustarten von Tor wird die Reiter Ihres Browsers nicht schlieÃ?en.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Es sind keine bereitgestellten BrÃ¼cke
 torlauncher.recommended_bridge=(empfohlen)
 
 torlauncher.connect=Verbinden
-torlauncher.reconnect=Wieder verbinden
+torlauncher.restart_tor=Tor neustarten
 torlauncher.quit=SchlieÃ?en
 torlauncher.quit_win=Beenden
 torlauncher.done=Fertig
 
 torlauncher.forAssistance=Falls Sie Hilfe benÃ¶tigen, kontaktieren Sie %S
 
+torlauncher.copiedNLogMessages=Kopie vollstÃ¤ndig. %S Tor-Protokollnachrichten sind bereit, um in eine Textbearbeitung oder in eine E-Mail-Nachricht eingefÃ¼gt zu werden.
+
 torlauncher.bootstrapStatus.conn_dir=Zu einem Relaisverzeichnis wird verbunden
 torlauncher.bootstrapStatus.handshake_dir=Es wird eine verschlÃ¼sselte Verbindung zu einem Verzeichnis hergestellt
 torlauncher.bootstrapStatus.requesting_status=Netzwerkstatus wird abgerufen
diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/dz/network-settings.dtd
+++ b/src/chrome/locale/dz/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/dz/torlauncher.properties
+++ b/src/chrome/locale/dz/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index a9a6bfd..0727666 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Î?Ï?Î¹">
 
 <!ENTITY torSettings.firstQuestion "Î Î¿Î¹Î¿ Î±Ï?Ï? Ï?Î± Ï?Î±Ï?Î±ÎºÎ¬Ï?Ï? Ï?ÎµÏ?Î¹Î³Ï?Î¬Ï?ÎµÎ¹ ÎºÎ±Î»Ï?Ï?ÎµÏ?Î± Ï?Î·Î½ ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î® Ï?Î±Ï?;">
-<!ENTITY torSettings.configurePrompt1 "Î£Ï?Î½Î´ÎµÏ?Î· Ï?Ï?Î¿ Î´Î¹Î±Î´Î¹ÎºÏ?Ï?Î¿ Î±Ï?Ï?Î¿Ï? Ï?Î¿Ï? Ï?Ï?Î¿Î»Î¿Î³Î¹Ï?Ï?Î® Î»Î¿Î³Î¿ÎºÏ?Î¹Î½ÎµÏ?Îµ, Ï?Î¹Î»Ï?Ï?Î±Ï?ÎµÏ?Îµ Î® ÎµÎ¼Ï?Î¿Î´Î¹Î¶ÎµÏ?Îµ Î³ÎµÎ½Î¹ÎºÏ?Ï?. ">
-<!ENTITY torSettings.configurePrompt2 "Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î½Ï?Î±Î¹ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ?, Î³Î¹Î± Ï?Î¿ firewall, Î® Î³Î¹Î± Ï?Î¿Î½ proxy Î¼Î¿Ï?.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Î¡Ï?Î¸Î¼Î¹Ï?Î· ">
 <!ENTITY torSettings.connectPrompt2 "Î?Î± Î®Î¸ÎµÎ»Î± Î½Î± Ï?Ï?Î½Î´ÎµÎ¸ÎµÎ¯ Î¬Î¼ÎµÏ?Î± Î¼Îµ Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor.">
 <!ENTITY torSettings.connectPrompt3 "Î?Ï?Ï?Ï? Î¸Î± Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î®Ï?ÎµÎ¹ Ï?Ï?Î¹Ï? Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÏ?ÎµÏ? Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÎ¹Ï?.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Î?Î¬Î½ Î´ÎµÎ½ ÎµÎ¯Ï?Ï?Îµ Î²ÎÎ²Î±Î¹Î¿Î¹ Ï?Ï?Ï? Î½Î± Î±Ï?Î±Î½Ï?Î®Ï?ÎµÏ?Îµ Ï?Ï?Î¿ ÎµÏ?Ï?Ï?Î·Î¼Î± Î±Ï?Ï?Ï?, Î´ÎµÎ¯Ï?Îµ Ï?Î¹Ï? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î´Î¹Î±Î´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Îµ Î¬Î»Î»Î¿ Ï?Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î® Î³Î¹Î± Î½Î± Î´ÎµÎ¯Ï?Îµ Î±Î½ ÎÏ?ÎµÎ¹ Ï?Ï?Î¸Î¼Î¹Ï?Ï?ÎµÎ¯ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯ Î´Î¹Î±ÎºÎ¿Î¼Î¹Ï?Ï?Î® Î¼ÎµÏ?Î¿Î»Î¬Î²Î·Ï?Î·Ï?.">
 <!ENTITY torSettings.enterProxy "Î?Î¹Ï?Î¬Î³Ï?Î³Î· Ï?Ï?Î½ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹Ï?Ï?Î® Î¼ÎµÏ?Î¿Î»Î¬Î²Î·Ï?Î·Ï?.">
-<!ENTITY torSettings.firewallQuestion "Î Î·Î³Î±Î¯Î½ÎµÎ¹ Î¼ÎÏ?Ï? ÎµÎ½Ï?Ï? Ï?ÎµÎ¯Ï?Î¿Ï?Ï? Ï?Ï?Î¿Ï?Ï?Î±Ï?Î¯Î±Ï? Ï?Î¿Ï? ÎµÏ?Î¹Ï?Ï?ÎÏ?ÎµÎ¹ Î¼Ï?Î½Î¿ Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï? Ï?Îµ Î¿Ï?Î¹Ï?Î¼ÎÎ½ÎµÏ? Î¸Ï?Ï?ÎµÏ? Ï?Ï?Î½Î´ÎµÏ?Î·Ï? Internet Î±Ï?Ï?Î¿Ï? Ï?Î¿Ï? Ï?Ï?Î¿Î»Î¿Î³Î¹Ï?Ï?Î®;">
-<!ENTITY torSettings.firewallHelp "Î?Î¬Î½ Î´ÎµÎ½ ÎµÎ¯Ï?Ï?Îµ Î²ÎÎ²Î±Î¹Î¿Î¹ Ï?Ï?Ï? Î½Î± Î±Ï?Î±Î½Ï?Î®Ï?ÎµÏ?Îµ Ï?Ï?Î¿ ÎµÏ?Ï?Ï?Î·Î¼Î± Î±Ï?Ï?Ï?, ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Î?Ï?Î¹. Î?Î¬Î½ Î±Î½Ï?Î¹Î¼ÎµÏ?Ï?Ï?Î¯Î¶ÎµÏ?Îµ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î± Î¼Îµ Ï?Î· Ï?Ï?Î½Î´ÎµÏ?Î· Î¼Îµ Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor, Î±Î»Î»Î¬Î¾Ï?Îµ Î±Ï?Ï?Î® Ï?Î· Ï?Ï?Î¸Î¼Î¹Ï?Î·. ">
-<!ENTITY torSettings.enterFirewall "Î Î»Î·ÎºÏ?Ï?Î¿Î»Î¿Î³Î®Ï?Ï?Îµ Î¼Î¹Î± Î»Î¯Ï?Ï?Î± Î´Î¹Î±Ï?Ï?Ï?Î¹Ï?Î¼ÎÎ½Î· Î¼Îµ ÎºÏ?Î¼Î¼Î±Ï?Î± Ï?Ï?Î½ Î¸Ï?Ï?Ï?Î½ Ï?Î¿Ï? ÎµÏ?Î¹Ï?Ï?ÎÏ?Î¿Î½Ï?Î±Î¹ Î±Ï?Ï? Ï?Î¿ firewall.">
 <!ENTITY torSettings.bridgeQuestion "Î?Î½Ï?Ï?Î¯Î¶ÎµÏ?Îµ Î±Î½ Î¿ Ï?Î¬Ï?Î¿Ï?Î¿Ï? (ISP) Ï?Î±Ï? Î¼Ï?Î»Î¿ÎºÎ¬Ï?ÎµÎ¹ Î® Î¼Îµ Î¿Ï?Î¿Î¹Î¿Î´Î®Ï?Î¿Ï?Îµ Ï?Ï?Ï?Ï?Î¿ ÎµÎ»ÎÎ³Ï?ÎµÎ¹ Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï?
 Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor?">
 <!ENTITY torSettings.bridgeHelp "Î?Î½ Î´Îµ Î¾ÎÏ?ÎµÏ?Îµ Ï?Ï?Ï? Î½Î± Î±Ï?Î±Î½Ï?Î®Ï?ÎµÏ?Îµ ÎµÎ´Ï?, ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ &quot;Î?Ï?Î¹&quot;.&#160; Î?Î½ ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ &quot;Î?Î±Î¹&quot;, Î¸Î± Ï?Î±Ï? Î¶Î·Ï?Î®Ï?Ï? Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ? Tor, Ï?Î¿Ï? ÎµÎ¯Î½Î±Î¹ Î¼Î· ÎµÏ?Ï?ÎÏ?Ï? Î³Î½Ï?Ï?Ï?Î¬ ÎºÎ±Î½Î¬Î»Î¹Î± ÎµÎ¹Ï?Ï?Î´Î¿Ï? Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor, Ï?Î¿Ï? Î´Ï?Ï?ÎºÎ¿Î»ÎµÏ?Î¿Ï?Î½ Ï?Ï?Î¿Ï?Ï? Ï?Ï?Î¿Ï?Ï?Î±Î¸Î¿Ï?Î½ Î½Î± Î¼Ï?Î»Î¿ÎºÎ¬Ï?Î¿Ï?Î½ Ï?Î¹Ï? Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï? Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor.">
@@ -60,6 +57,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Î?ÎÏ?Ï? Ï?Î¿Ï? Î?Î¹Î±Î´Î¹ÎºÏ?Ï?Î¿Ï?">
 <!ENTITY torsettings.bridgeHelp2 "Î§Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?Ï?Îµ ÎÎ½Î±Î½ Ï?Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î® Î³Î¹Î± Î½Î± ÎµÏ?Î¹Ï?ÎºÎµÏ?Ï?ÎµÎ¯Ï?Îµ Ï?Î¿ https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Î?ÎÏ?Ï? Ï?Î·Ï? Î?Ï?Ï?Î¿Î¼Î±Ï?Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î·Ï? Î?Ï?Î¬Î½Ï?Î·Ï?Î·Ï? Email">
-<!ENTITY torsettings.bridgeHelp3 "Î£Ï?ÎµÎ¯Î»Ï?Îµ email Ï?Ï?Î¿ bridges@xxxxxxxxxxxxxx Î¼Îµ Î¼Ï?Î½Î¿ Î¼Îµ Ï?Î¹Ï? Î»ÎÎ¾ÎµÎ¹Ï? 'get bridges' Ï?Ï?Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿.&#160; Î?Î¹Î± Î½Î± Î´Ï?Ï?ÎºÎ¿Î»ÎÏ?Î¿Ï?Î¼Îµ Ï?Î¿Ï?Ï? Î±Î½Ï?Î¹Ï?Î¬Î»Î¿Ï?Ï? Î¼Î±Ï? Ï?Î¿Ï? Î¸ÎÎ»Î¿Ï?Î½ Î¼Î± Î¼Î¬Î¸Î¿Ï?Î½ Ï?Î¿Î»Î»ÎÏ? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Î³ÎµÏ?Ï?Ï?Ï?Î½, Î´ÎµÏ?Ï?Î¼Î±Ï?Ï?Îµ Î¼Î·Î½Ï?Î¼Î±Ï?Î± Î¼Ï?Î½Î¿ Î±Ï?Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Ï?Î¿Ï? Ï?ÎµÎ»ÎµÎ¹Ï?Î½Î¿Ï?Î½ Ï?Îµ gmail.com Î® yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Î?ÎÏ?Ï? Ï?Î·Ï? Î¥Ï?Î¿Ï?Ï?Î®Ï?Î¹Î¾Î·Ï?">
 <!ENTITY torsettings.bridgeHelp4 "Î?Î½ Ï?Î»Î± Ï?Î± Î¬Î»Î»Î± Î±Ï?Î¿Ï?Ï?Ï?Î¿Ï?Î½, Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Î¶Î·Ï?Î®Ï?ÎµÏ?Îµ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Î³ÎµÏ?Ï?Ï?Ï?Î½ Ï?Ï?ÎÎ»Î½Î¿Î½Ï?Î±Ï? ÎÎ½Î± ÎµÏ?Î³ÎµÎ½Î¹ÎºÏ? email Ï?Ï?Î¿ help@xxxxxxxxxxxxxxxxxx&#160; Î£Î·Î¼ÎµÎ¯Ï?Ï?Î·: Î?Î¬Ï?Î¿Î¹Î¿Ï? ÎµÎ¸ÎµÎ»Î¿Î½Ï?Î®Ï? Î¸Î± Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± Î±Ï?Î±Î½Ï?Î®Ï?ÎµÎ¹ Ï?ÎµÎ¹Ï?Î¿ÎºÎ¯Î½Î·Ï?Î± (Ï?Ï?Î½ÎµÏ?Ï?Ï? Î· Î±Ï?Î¬Î½Ï?Î·Ï?Î· Î¯Ï?Ï?Ï? Î±Ï?Î³Î®Ï?ÎµÎ¹).">
diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties
index 5ea3b28..7f10f07 100644
--- a/src/chrome/locale/el/torlauncher.properties
+++ b/src/chrome/locale/el/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Î¤Î¿ Tor Ï?Ï?Î±Î¼Î¬Ï?Î·Ï?Îµ Î±Ï?Ï?Î¿Ï?Î´Ï?ÎºÎ·Ï?Î±
-torlauncher.tor_connection_lost= Î? Ï?Ï?Î½Î´ÎµÏ?Î· Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor Ï?Î¬Î¸Î·ÎºÎµ.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Î?ÎµÎ½ Î®Ï?Î±Î½ Î´Ï?Î½Î±Ï?Î® Î· Ï?Ï?Î½Î´ÎµÏ?Î· Î¼Îµ Ï?Î·Î½ Ï?Ï?Î¿Î´Î¿Ï?Î· ÎµÎ»ÎÎ³Ï?Î¿Ï? Ï?Î¿Ï? Tor.
 torlauncher.tor_failed_to_start=Î?Î´Ï?Î½Î±Î¼Î¯Î± ÎµÎºÎºÎ¯Î½Î·Ï?Î·Ï? Ï?Î¿Ï? Tor.
 torlauncher.tor_control_failed=Î?Ï?ÎÏ?Ï?Ï?Îµ Î½Î± Ï?Î¬Ï?ÎµÎ¹ Ï?Î¿Î½ ÎÎ»ÎµÎ³Ï?Î¿ Ï?Î¿Ï? Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Î?ÎµÎ½ Ï?Ï?Î¬Ï?Ï?Î¿Ï?Î½ Î³ÎÏ?Ï?Ï?ÎµÏ?
 torlauncher.recommended_bridge=(Ï?Ï?Î½Î¹Ï?Ï?Î¬Ï?Î±Î¹)
 
 torlauncher.connect=Î£Ï?Î½Î´ÎµÏ?Î·
-torlauncher.reconnect=Î?Ï?Î±Î½Î±Ï?Ï?Î½Î´ÎµÏ?Î·
+torlauncher.restart_tor=EÏ?Î±Î½ÎµÎºÎºÎ¯Î½Î·Ï?Î· Tor
 torlauncher.quit=Î?Î¾Î¿Î´Î¿Ï?
 torlauncher.quit_win=Î?Î¾Î¿Î´Î¿Ï?
 torlauncher.done=Î¤ÎµÎ»Î¿Ï?
 
 torlauncher.forAssistance=Î?Î¹Î± Î²Î¿Î®Î¸ÎµÎ¹Î±, ÎµÏ?Î¹ÎºÎ¿Î¹Î½Ï?Î½Î®Ï?Ï?Îµ Î¼Îµ Ï?Î¿% S 
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Î£Ï?Î½Î´ÎµÏ?Î· Ï?Îµ ÎµÎ½Î´Î¹Î¬Î¼ÎµÏ?Î¿ (relay) ÎºÎ±Ï?Î¬Î»Î¿Î³Î¿
 torlauncher.bootstrapStatus.handshake_dir=Î Ï?Î±Î³Î¼Î±Ï?Î¿Ï?Î¿Î¹Î®Î¸Î·ÎºÎµ Ï?Ï?Î½Î´ÎµÏ?Î· Ï?Îµ ÎºÏ?Ï?Ï?Ï?Î¿Î³Ï?Î±Ï?Î·Î¼ÎÎ½Î¿ ÎºÎ±Ï?Î¬Î»Î¿Î³Î¿
 torlauncher.bootstrapStatus.requesting_status=Î?Î½Î¬ÎºÏ?Î·Ï?Î· Ï?Î·Ï? ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î·Ï? Ï?Î¿Ï? Î´Î¹ÎºÏ?Ï?Î¿Ï?
diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/en-GB/network-settings.dtd
+++ b/src/chrome/locale/en-GB/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/en-GB/torlauncher.properties
+++ b/src/chrome/locale/en-GB/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd
index bdd711d..5f32b65 100644
--- a/src/chrome/locale/eo/network-settings.dtd
+++ b/src/chrome/locale/eo/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties
index 5cfa121..8a3706c 100644
--- a/src/chrome/locale/eo/torlauncher.properties
+++ b/src/chrome/locale/eo/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Eliri
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Konektante al relajsa dosierujo
 torlauncher.bootstrapStatus.handshake_dir=Starigante Ä?ifritan dosierujan konekton
 torlauncher.bootstrapStatus.requesting_status=Ricevante retan staton
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index c037e32..d398aa6 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -1,27 +1,24 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.dialog.title "Configuraciones de la red Tor">
 
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
-<!ENTITY torSettings.yes "Yes">
+<!ENTITY torSettings.yes "Si">
 <!ENTITY torSettings.no "No">
 
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
+<!ENTITY torSettings.firstQuestion "Â¿CuÃ¡l de las siguientes opciones describe mejor su situaciÃ³n?">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
+<!ENTITY torSettings.configure "Configurar">
+<!ENTITY torSettings.connectPrompt2 "Me gustarÃa conectar directamente a la red Tor.">
+<!ENTITY torSettings.connectPrompt3 "Esto deberÃa funcionar en la mayorÃa de situaciones.">
 <!ENTITY torSettings.connect "Conectar">
 
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -29,17 +26,17 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Reiniciar Tor">
 
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet">
 <!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.address "Address:">
+<!ENTITY torsettings.useProxy.address "DirecciÃ³n:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port:">
-<!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.port "Puerto:">
+<!ENTITY torsettings.useProxy.username "Usuario:">
+<!ENTITY torsettings.useProxy.password "ContraseÃ±a:">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
@@ -56,9 +53,10 @@
 <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
 <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
 <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
-<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
+<!ENTITY torsettings.bridgeHelp2Heading "A travÃ©s de la Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties
index d494033..6b9b4af 100644
--- a/src/chrome/locale/es-AR/torlauncher.properties
+++ b/src/chrome/locale/es-AR/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Lanzador de Tor
 
-torlauncher.tor_exited=Salida inesperada de Tor
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor se cerrÃ³ inesperadamente. Esto pudo ser debido a un error dentro de Tor, otro programa en tu sistema, o hardware defectuoso. Hasta que reinicies Tor, el navegador Tor no serÃ¡ capaz de acceder a sitios web. Si el problema persiste, por favor envÃa una copia de tu archivo de registro de Tor al equipo de soporte tÃ©cnico.
+torlauncher.tor_exited2=Reiniciar Tor no cerrarÃ¡ las pestaÃ±as de navegaciÃ³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
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan
 torlauncher.recommended_bridge=(recomendado)
 
 torlauncher.connect=Conectar
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Reiniciar Tor
 torlauncher.quit=Quitar
 torlauncher.quit_win=Salir
 torlauncher.done=Hecho
 
 torlauncher.forAssistance=Para solicitar asistencia, contactese al %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio 
 torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexiÃ³n segura al directorio
 torlauncher.bootstrapStatus.requesting_status=Regresando el estado de la red de trabajo
diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/es-CL/network-settings.dtd
+++ b/src/chrome/locale/es-CL/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/es-CL/torlauncher.properties
+++ b/src/chrome/locale/es-CL/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/es-CO/network-settings.dtd
+++ b/src/chrome/locale/es-CO/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/es-CO/torlauncher.properties
+++ b/src/chrome/locale/es-CO/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd
index dc1309a..f6960ea 100644
--- a/src/chrome/locale/es-MX/network-settings.dtd
+++ b/src/chrome/locale/es-MX/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties
index 52f013c..964c3b6 100644
--- a/src/chrome/locale/es-MX/torlauncher.properties
+++ b/src/chrome/locale/es-MX/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Lanzador Tor
 
-torlauncher.tor_exited=Tor se cerrÃ³ inesperadamente.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=NingÃºn puente proporcionado que tenga
 torlauncher.recommended_bridge=(recomendado)
 
 torlauncher.connect=Conectar
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Abandonar
 torlauncher.quit_win=Salir
 torlauncher.done=Hecho
 
 torlauncher.forAssistance=Si necesitas ayuda, contacta a %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio de retransmisiÃ³n
 torlauncher.bootstrapStatus.handshake_dir=Estableciendo conexiÃ³n con un directorio encriptado.
 torlauncher.bootstrapStatus.requesting_status=Recuperando estado de la red
diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd
index dd1d82d..73b9f80 100644
--- a/src/chrome/locale/es/network-settings.dtd
+++ b/src/chrome/locale/es/network-settings.dtd
@@ -4,24 +4,21 @@
 
 <!ENTITY torsettings.prompt "Antes de que se conecte a la red Tor, necesita proporcionar informaciÃ³n sobre la conexiÃ³n a Internet de este equipo.">
 
-<!ENTITY torSettings.yes "SÃ">
+<!ENTITY torSettings.yes "Si">
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Â¿CuÃ¡l de las siguientes describe mejor su situaciÃ³n?">
-<!ENTITY torSettings.configurePrompt1 "La conexiÃ³n a Internet de esta computadora estÃ¡ censurada, filtrada o proxificada.">
-<!ENTITY torSettings.configurePrompt2 "Necesito configurar las preferencias de repetidor puente ('bridge'), cortafuegos ('firewall'), o proxy.">
+<!ENTITY torSettings.configurePrompt1 "La conexiÃ³n a Internet de este equipo estÃ¡ censurada o proxyficada.">
+<!ENTITY torSettings.configurePrompt2 "Tengo que ajustar las configuraciones de puente ('bridge') o proxy.">
 <!ENTITY torSettings.configure "Configurar">
 <!ENTITY torSettings.connectPrompt2 "Me gustarÃa conectar directamente a la red Tor.">
 <!ENTITY torSettings.connectPrompt3 "Esto funcionarÃ¡ en la mayorÃa de las situaciones.">
 <!ENTITY torSettings.connect "Conectar">
 
-<!ENTITY torSettings.proxyQuestion "Â¿Necesita usar un proxy de acceso a Internet esta computadora ?">
+<!ENTITY torSettings.proxyQuestion "Â¿Necesita esta computadora usar un proxy para acceder a Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Si no estÃ¡ seguro de cÃ³mo responder a esta pregunta, eche un vistazo a las configuraciones de Internet en otro navegador para ver si estÃ¡ configurado para usar un proxy.">
-<!ENTITY torSettings.enterProxy "Introduzca las preferencias para proxy.">
-<!ENTITY torSettings.firewallQuestion "Â¿Va la conexiÃ³n a Internet de esta computadora a travÃ©s de un cortafuegos ('firewall') que sÃ³lo permite conexiones a ciertos puertos?">
-<!ENTITY torSettings.firewallHelp "Si no estÃ¡ seguro de cÃ³mo responder a esta pregunta, elija No. Si encuentra problemas conectando a la red Tor, cambie esta configuraciÃ³n.">
-<!ENTITY torSettings.enterFirewall "Introduzca una lista de puertos separada por comas que estÃ© permitida por el cortafuegos ('firewall').">
+<!ENTITY torSettings.enterProxy "Introduzca los ajustes del proxy.">
 <!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?">
 <!ENTITY torSettings.bridgeHelp "Si no estÃ¡ seguro como responder a esta pregunta, elija No.&#160; Si usted elige SÃ, se le pedirÃ¡ configurar puentes Tor, los cuales son repetidores no listados que hacen mÃ¡s difÃcil el bloqueo de conexiones hacia la red Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Puede usar el juego de repetidores puente ('bridge') proporcionado, o puede obtener e introducir un juego de puentes personalizado.">
@@ -34,7 +31,7 @@
 <!ENTITY torsettings.optional "Opcional">
 
 <!ENTITY torsettings.useProxy.checkbox "Esta computadora necesita usar usar un proxy de acceso a Internet">
-<!ENTITY torsettings.useProxy.type "Tipo de Proxy:">
+<!ENTITY torsettings.useProxy.type "Tipo de proxy:">
 <!ENTITY torsettings.useProxy.address "DirecciÃ³n:">
 <!ENTITY torsettings.useProxy.address.placeholder "DirecciÃ³n IP o nombre de mÃ¡quina ('hostname')">
 <!ENTITY torsettings.useProxy.port "Puerto:">
@@ -50,16 +47,17 @@
 <!ENTITY torsettings.useBridges.type "Tipo de transporte:">
 <!ENTITY torsettings.useBridges.custom "Introducir puentes personalizados">
 <!ENTITY torsettings.useBridges.label "Introduzca uno o mÃ¡s repetidores puente ('bridge', uno por lÃnea).">
-<!ENTITY torsettings.useBridges.placeholder "ingrese direcciÃ³n:puerto">
+<!ENTITY torsettings.useBridges.placeholder "introduzca direcciÃ³n:puerto">
 
 <!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles">
-<!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')">
+<!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')">
 <!ENTITY torsettings.bridgeHelp1 "Si no puede conectar a la red Tor, podrÃa ser que su proveedor de servicios de Internet (ISP) u otra agencia, estÃ© bloqueando Tor.&#160; A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son publicitados, y es mÃ¡s difÃcil que sean bloqueados.">
 <!ENTITY torsettings.bridgeHelp1B "Puede usar el juego de direcciones de repetidores puente ('bridge') preconfigurado proporcionado, o puede obtener un juego de direcciones personalizado usando uno de estos tres mÃ©todos:">
 <!ENTITY torsettings.bridgeHelp2Heading "Mediante la web">
 <!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrÃ³nico automÃ¡tico">
-<!ENTITY torsettings.bridgeHelp3 "EnvÃe un correo a bridges@xxxxxxxxxxxxxx con la lÃnea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para hacer mÃ¡s difÃcil a un atacante aprender muchas direcciones de puentes, ha de enviar esta solicitud desde una direcciÃ³n de correo de gmail.com o yahoo.com .">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "EnvÃe un correo electrÃ³nico a bridges@xxxxxxxxxxxxxx Ãºnicamente con la lÃnea 'get bridges' en el cuerpo del mensaje.&#160; Sin embargo, para ponerle mÃ¡s difÃcil a un atacante adquirir muchas direcciones de puentes, tiene que enviar esta peticiÃ³n desde uno de los siguientes proveedores de correo electrÃ³nico (listados en orden de preferencia):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com o https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Mediante el gabinete de ayuda">
 <!ENTITY torsettings.bridgeHelp4 "Como Ãºltimo recurso, puede pedir direcciones de repetidores puente enviando un cortÃ©s mensaje de correo a help@xxxxxxxxxxxxxxxxx .&#160;
 Por favor observe que es una persona la que tendrÃ¡ que responder a cada peticiÃ³n.">
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties
index 7edc87e..6f1c18a 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Arranque de Tor
 
-torlauncher.tor_exited=Tor se cerrÃ³ inesperadamente.
-torlauncher.tor_connection_lost=Se ha perdido su conexiÃ³n a la red Tor.
+torlauncher.tor_exited=Tor se cerrÃ³ inesperadamente. Esto podrÃa deberse a un fallo con el propio Tor, con otro programa de su sistema, o a hardware defectuoso. Hasta que reinicie Tor, el Navegador Tor no podrÃ¡ alcanzar ningÃºn sitio web. Si el problema persiste, por favor envÃe una copia de su Registro de Tor (log) al equipo de soporte.
+torlauncher.tor_exited2=Al reiniciar Tor no cerrarÃ¡ las pestaÃ±as de su navegador.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No hay disponible ningÃºn repetidor pu
 torlauncher.recommended_bridge=(recomendado)
 
 torlauncher.connect=Conectar
-torlauncher.reconnect=Reconectar
+torlauncher.restart_tor=Reiniciar Tor
 torlauncher.quit=Salir
 torlauncher.quit_win=Salir
 torlauncher.done=Listo
 
 torlauncher.forAssistance=Para obtener ayuda, contacte con %S
 
+torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor estÃ¡n listos para ser pegados en un editor de texto o un mensaje de correo electrÃ³nico.
+
 torlauncher.bootstrapStatus.conn_dir=Conectando a un repositorio ('Directory') de repetidores ('relays')
 torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexiÃ³n cifrada con el repositorio de repetidores
 torlauncher.bootstrapStatus.requesting_status=Recopilando el estado de la red
diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd
index c1da578..15fa9d4 100644
--- a/src/chrome/locale/et/network-settings.dtd
+++ b/src/chrome/locale/et/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ei">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties
index 01de316..1ebd50d 100644
--- a/src/chrome/locale/et/torlauncher.properties
+++ b/src/chrome/locale/et/torlauncher.properties
@@ -1,17 +1,17 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Tor Launcher
+torlauncher.error_title=Tori kÃ¤ivitaja
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-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_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
+torlauncher.tor_controlconn_failed=Ei suutnud luua Ã¼hendust Tor-i kontroll pordiga.
+torlauncher.tor_failed_to_start=Tor-i kÃ¤ivitamine ebaÃµnnestus
 torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
+torlauncher.tor_bootstrap_failed=Tor-il ebaÃµnnestus Ã¼henduse loomine Tor vÃµrguga.
 torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+torlauncher.unable_to_start_tor=Ei suuda kÃ¤ivitada Tor-i.\n\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
 torlauncher.torrc_missing=The torrc file is missing.
 torlauncher.datadir_missing=The Tor data directory does not exist.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Valmis
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd
index ea1c8cc..d992e0f 100644
--- a/src/chrome/locale/eu/network-settings.dtd
+++ b/src/chrome/locale/eu/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ez">
 
 <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?">
-<!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta, iragazita, edo proxyatuta dago.">
-<!ENTITY torSettings.configurePrompt2 "Zubi, sueten, edo proxy ezarpenak konfiguratu behar ditut.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Konfiguratu">
 <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke.">
 <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy bat erabiltzeko konfiguratuta dagoen ikusteko.">
 <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak.">
-<!ENTITY torSettings.firewallQuestion "Ordenagailu honen Interneteko konexioa ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar al doa?">
-<!ENTITY torSettings.firewallHelp "Galdera hau nola erantzuteaz zalantzan bazaude, hautatu Ez. Tor sarera konektatzen arazoak aurkitzen badituzu, aldatu ezarpen hau.">
-<!ENTITY torSettings.enterFirewall "Suetenak baimendutako eta komaz banandutako ataka zerrenda bat sar ezazu ">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Webean bidez">
 <!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko">
 <!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez">
-<!ENTITY torsettings.bridgeHelp3 "Bidali ezazu mezu bat bridges@xxxxxxxxxxxxxxxxxx mezuaren gorputzean 'get bridges' esaldiarekin.&#160; Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu: gmail.com edo yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez">
 <!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help@xxxxxxxxxxxxxxxxxxxxx bidaliz.&#160; Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela.">
diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties
index 3f4a852..7d2c0a9 100644
--- a/src/chrome/locale/eu/torlauncher.properties
+++ b/src/chrome/locale/eu/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor abiarazlea
 
-torlauncher.tor_exited=Tor ustekabean irten da.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Ez daude eskuragarri %S garraio mota d
 torlauncher.recommended_bridge=(gomendatuta)
 
 torlauncher.connect=Konektatu
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Irten
 torlauncher.quit_win=Irten
 torlauncher.done=Eginda
 
 torlauncher.forAssistance=Laguntza lortzeko, %S(r)ekin harremanetan jarri
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Errele direktorio batera konektatzen
 torlauncher.bootstrapStatus.handshake_dir=Enkriptatutako direktorio batera konexioa ezartzen
 torlauncher.bootstrapStatus.requesting_status=Sarearen egoera eskuratzen
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index 136acea..3b755f8 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ù?Ù?">
 
 <!ENTITY torSettings.firstQuestion "Ú©Ø¯Ø§Ù? Û?Ú© Ø§Ø² Ù?Ù?Ø§Ø±Ø¯ Ø²Û?Ø± Ù?Ø¶Ø¹Û?Øª Ø´Ù?Ø§ Ø±Ø§ Ø¨Ù?ØªØ± Ø¨Û?Ø§Ù? Ù?Û?â??Ú©Ù?Ø¯Ø?">
-<!ENTITY torSettings.configurePrompt1 "Ø§Û?Ù?ØªØ±Ù?Øª Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø´Ø¯Ù? Ø¯Ø± Ø§Û?Ù? Ø±Ø§Û?Ø§Ù?Ù? Ù?Ø§ Ø³Ø§Ù?Ø³Ù?Ø± Ø´Ø¯Ù?Ù«Ù?Û?Ù?ØªØ± Ø´Ø¯Ù? Ù? Û?Ø§ Ø¹Ø¨Ù?Ø± Ú©Ø±Ø¯Ù? Ø§Ø² Ø±Ù?Û? Ù¾Ø±Ø§Ú©Ø³Û? Ù?Û? Ø¨Ø§Ø´Ù?Ø¯.">
-<!ENTITY torSettings.configurePrompt2 "Ù?Ù? Ù?Û?Ø§Ø² Ø¯Ø§Ø±Ù? Ú©Ù? Â«Ù¾Ù? Ù?Ø§Â»Ø? Â«Ù¾Ø±Ù?Ú©Ø³Û?Â» Ù? Û?Ø§ Â«Ù?Ø§Û?Ø±Ù?Ø§Ù?Â» Ø±Ø§ ØªÙ?Ø¸Û?Ù? Ú©Ù?Ù?.">
+<!ENTITY torSettings.configurePrompt1 "Ø§ØªØµØ§Ù? Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø§Û?Ù? Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Û?Ø§ Ù?Û?Ù?ØªØ±Û?Ù?Ú¯ Ø´Ø¯Û?Ø¯ Ø¯Ø§Ø±Ø¯ Ù? Û?Ø§ Ù¾Ø±Ø§Ú©Ø³Û? Ø¯Ø§Ø±Ø¯.">
+<!ENTITY torSettings.configurePrompt2 "Ù?Ù? Ù?Û?Ø§Ø² Ø¨Ù? Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ù¾Ù? Ù? Û?Ø§ ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ù?Ú©Ø³Û? Ø¯Ø§Ø±Ù?.">
 <!ENTITY torSettings.configure "Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û?">
 <!ENTITY torSettings.connectPrompt2 "ØªÙ?Ø§Û?Ù? Ø¯Ø§Ø±Ù? Ù?Ø³ØªÙ?Û?Ù?Ø§ Ø¨Ù? Ø´Ø¨Ú©Ù?â??Û? ØªÙ?Ø± Ù?ØªØµÙ? Ø´Ù?Ù?.">
 <!ENTITY torSettings.connectPrompt3 "Ø§Û?Ù? Ø¯Ø± Ø¨Û?Ø´ØªØ± Ù?Ù?Ø§Ù?Ø¹ Ú©Ø§Ø± Ø®Ù?Ø§Ù?Ø¯ Ú©Ø±Ø¯.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ø§Ú¯Ø± Ù?Ø·Ù?Ø¦Ù? Ù?Û?Ø³ØªÛ?Ø¯ Ú?Ø·Ù?Ø± Ø¨Ù? Ø§Û?Ù? Ø³Ù?Ø§Ù? Ù¾Ø§Ø³Ø® Ø¯Ù?Û?Ø¯Ø? Ø¨Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø³Ø§Û?Ø± Ù?Ø±Ù?Ø±Ú¯Ø±Ù?Ø§Û? Ø®Ù?Ø¯ Ù?Ú¯Ø§Ù?Û? Ø¨Û?Ø§Ù?Ø¯Ø§Ø²Û?Ø¯ ØªØ§ Ù?ØªÙ?Ø¬Ù? Ø´Ù?Û?Ø¯ Ú©Ù? Ø¢Û?Ø§ Ø¨Ø§Û?Ø¯ Û?Ú© Ù¾Ø±Ù?Ú©Ø³Û? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø´Ù?Ø¯ Û?Ø§ Ø®Û?Ø±.">
 <!ENTITY torSettings.enterProxy "ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ø±Ø§ Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯.">
-<!ENTITY torSettings.firewallQuestion "Ø¢Û?Ø§ Ø¯Ø± Ù?Ø³Û?Ø± Ø§Ø±ØªØ¨Ø§Ø· Ø´Ù?Ø§ Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?Øª Û?Ú© Ù?Ø§Û?Ø±Ù?Ø§Ù? Ù?Ø¬Ù?Ø¯ Ø¯Ø§Ø±Ø¯Ø? Ù? Ù?Ù?Ø· Ø§Ø¬Ø§Ø²Ù? Ø§ØªØµØ§Ù? Ø§Ø² Û?Ú© Ø¯Ø±Ú¯Ø§Ù? Ø®Ø§Øµ Ø±Ø§ Ù?Û? Ø¯Ù?Ø¯Ø?">
-<!ENTITY torSettings.firewallHelp "Ø§Ú¯Ø± Ù?Ø·Ù?Ø¦Ù? Ù?Û?Ø³ØªÛ?Ø¯ Ú?Ù? Ø¬Ù?Ø§Ø¨Û? Ø¨Ù? Ø§Û?Ù? Ø³Ù?Ø§Ù? Ø¯Ù?Û?Ø¯Ø? Â«Ù?Ù?Â» Ù? Û?Ø§ Â«Ø®Û?Ø±Â» Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯. Ø³Ù¾Ø³ Ø§Ú¯Ø± Ù?Ø´Ú©Ù?Û? Ø¯Ø± Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ Ø´Ø¨Ú©Ù? ØªÙ?Ø± Ø¯Ø§Ø´ØªÛ?Ø¯Ø? Ø§Û?Ù? Ù?Ù?Ø±Ø¯ Ø±Ø§ ØªØºÛ?Û?Ø± Ø¯Ù?Û?Ø¯.">
-<!ENTITY torSettings.enterFirewall "Û?Ú© Ù?Û?Ø³Øª Ø¬Ø¯Ø§Ø´Ø¯Ù? Ø¨Ø§ Ù?Û?Ø±Ú¯Ù?Ù? Ø§Ø² Ù¾Ù?Ø±Øªâ??Ù?Ø§Û?Û? Ú©Ù? ØªÙ?Ø³Ø· Ù?Ø§Û?Ø±Ù?Ø§Ù? Ù?Ø¬Ø§Ø² Ù?Ø³ØªÙ?Ø¯.">
 <!ENTITY torSettings.bridgeQuestion "Ø¢Û?Ø§ Ø´Ø±Ú©ØªÛ? Ú©Ù? Ø§Ø² Ø¢Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ú¯Ø±Ù?ØªÙ? Ø§Û?Ø¯ (ISP)Ø? Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ø´Ø¨Ú©Ù? ØªÙ?Ø± Ø±Ø§ Ù?Û?Ù?ØªØ±Ø? Ø³Ø§Ù?Ø³Ù?Ø± Ù? Û?Ø§ Ù?Ø³Ø¯Ù?Ø¯ Ù?Û? Ú©Ù?Ø¯Ø?">
 <!ENTITY torSettings.bridgeHelp "Ø§Ú¯Ø± Ù?Ø·Ù?Ø¦Ù? Ù?Û?Ø³ØªÛ?Ø¯ Ú?Ø·Ù?Ø± Ø¨Ù? Ø§Û?Ù? Ø³Ù?Ø§Ù? Ù¾Ø§Ø³Ø® Ø¯Ù?Û?Ø¯Ø? Â«Ù?Ù?Â» Û?Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯.&#160; Ø§Ú¯Ø± Â«Ø¨Ù?Ù?Â» Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯Ø? Ù?Û? Ø¨Ø§Û?Ø³Øª ØªÙ?Ø¸Û?Ù?Ø§Øª Ù?Ø±Ø¨Ù?Ø· Ø¨Ù? Â«Ù¾Ù? Ù?Ø§Û?Â» ØªÙ?Ø± Ø±Ø§ Ø§Ù?Ø¬Ø§Ù? Ø¯Ù?Û?Ø¯. Ù¾Ù? Ù?Ø§ Ù?Ø³Û?Ø±Ù?Ø§Û? Ø¯Ù?Ø± Ø²Ø¯Ù? Ù?Û?Ù?ØªØ± Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ù?Û?Ø³Øª Ù?Ø´Ø®ØµÛ? Ø§Ø² Ø¢Ù? Ù?Ø§ Ù?Ø¬Ù?Ø¯ Ù?Ø¯Ø§Ø±Ø¯ Ù? Ù?Û?Ù?ØªØ± Ú©Ø±Ø¯Ù? Ø¢Ù? Ù?Ø§ Ø¨Ø³Û?Ø§Ø± Ù?Ø´Ú©Ù? Ø§Ø³Øª.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Ø´Ù?Ø§ Ù?Û?â??ØªÙ?Ø§Ù?Û?Ø¯ Ø§Ø² Ù?Ø¬Ù?Ù?Ø¹Ù?â??Ø§Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§Û? Ø¢Ù?Ø§Ø¯Ù? Ù? Û?Ø§ Ù¾Ù?â??Ù?Ø§Û? Ø´Ø®ØµÛ? Ø®Ù?Ø¯ØªØ§Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯.">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ø¯Ø± Ø§Ù?ØªØ¸Ø§Ø± Ø¢ØºØ§Ø² Ø¨Ù? Ú©Ø§Ø± ØªÙ?Ø±...">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "ØªÙ?Ø± Ø±Ø§ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø´Ù?Ø±Ù?Ø¹ Ú©Ù?Û?Ø¯.">
 
 <!ENTITY torsettings.optional "Ø§Ø®ØªÛ?Ø§Ø±Û?">
 
@@ -60,6 +57,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Ø§Ø² Ø·Ø±Û?Ù? Ø§Û?Ù?ØªØ±Ù?Øª">
 <!ENTITY torsettings.bridgeHelp2 "Ø¨Ø§ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Û?Ú© Ù?Ø±Ù?Ø±Ú¯Ø± Ø¨Ù? Ø¢Ø¯Ø±Ø³ https://bridges.torproject.org Ø¨Ø±Ù?Û?Ø¯.">
 <!ENTITY torsettings.bridgeHelp3Heading "Ø§Ø² Ø·Ø±Û?Ù? Ø¢Ø¯Ø±Ø³ Ø§Û?Ù?Û?Ù? Ù¾Ø§Ø³Ø®Ú¯Ù?Û? Ø®Ù?Ø¯Ú©Ø§Ø±">
-<!ENTITY torsettings.bridgeHelp3 "Û?Ú© Ø§Û?Ù?Û?Ù? ØØ§Ù?Û? Ø¹Ø¨Ø§Ø±Øª  'get bridges' Ø¨Ù? Ø¢Ø¯Ø±Ø³ bridges@xxxxxxxxxxxxxx  Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯.&#160; Ø¨Ø±Ø§Û? Ø§Û?Ù?Ú©Ù? Ø¨ØªÙ?Ø§Ù?Û?Ù? Ø¬Ù?Ù?Û? Ù?Û?Ù?ØªØ± Ø´Ø¯Ù? Ù¾Ù? Ù?Ø§ Ø±Ø§ Ø¨Ú¯Û?Ø±Û?Ù?Ø? Ù?Ø¬Ø¨Ù?Ø±Û?Ù? Ø´Ù?Ø§ Ø±Ø§ Ù?ØØ¯Ù?Ø¯ Ú©Ù?Û?Ù? ØªØ§ Ù?Ù?Ø· Ø§Ø² Û?Ú© Ø¢Ø¯Ø±Ø³ Ø§Û?Ù?Û?Ù? yahoo.com Ù? Û?Ø§ gmail.com Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø®Ù?Ø¯ Ø±Ø§ Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯. Ù?Ø·Ù?Ø§Ù? ØµØ¨Ù?Ø± Ø¨Ø§Ø´Û?Ø¯. Ø§Ø² Ú?Ù?Ø¯ Ø¯Ù?Û?Ù?Ù? ØªØ§ Ú?Ù?Ø¯ Ø³Ø§Ø¹Øª Ø·Ù?Ù? Ø®Ù?Ø§Ù?Ø¯ Ú©Ø´Û?Ø¯ ØªØ§ Ø¨Ù? Ø·Ù?Ø± Ø®Ù?Ø¯Ú©Ø§Ø± Ù¾Ù? Ù?Ø§ Ø¨Ø±Ø§Û? Ø´Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ø´Ù?Ù?Ø¯.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, Û?Ø§ https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Ø§Ø² Ø·Ø±Û?Ù? Ù?Ø§ØØ¯ Ú©Ù?Ú© Ø±Ø³Ø§Ù?Û?">
 <!ENTITY torsettings.bridgeHelp4 "Ø§Ú¯Ø± Ø§Ø² Ø·Ø±Û?Ù? Ù?Û?Ú? Ú©Ø¯Ø§Ù? Ø§Ø² Ø±Ø§Ù? ØÙ? Ù?Ø§Û? Ù?Ù?Ù? Ø¨Ù? Ù?ØªÛ?Ø¬Ù? Ù?Ø±Ø³Û?Ø¯Û?Ø¯Ø? Û?Ú© Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù?Ù?Ø¯Ø¨Ø§Ù?Ù? Ø¨Ù? Ø¢Ø¯Ø±Ø³ help@xxxxxxxxxxxxxxxxx Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯.&#160; Ø¯Ø± Ù?Ø¸Ø± Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯ Ú©Ù? Û?Ú© Ù?Ù?Ø± Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ø´Ù?Ø§ Ø±Ø§ Ø¨Ø®Ù?Ø§Ù?Ø¯ Ù? Ø¨Ù? Ø¢Ù? Ù¾Ø§Ø³Ø® Ø¯Ù?Ø¯. Ù¾Ø³ ØµØ¨Ù?Ø± Ø¨Ø§Ø´Û?Ø¯.">
diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties
index 18906ed..bdd5c09 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Ø§Ø¬Ø±Ø§ Ú©Ù?Ù?Ø¯Ù? ØªÙ?Ø±
 
-torlauncher.tor_exited=ØªÙ?Ø± Ø¨Ù?â??Ø¯Ù?Û?Ù?Û? Ù?Ø§Ù?Ø´Ø®Øµ Ø®Ø§Ø±Ø¬ Ø´Ø¯.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor Ø¨Ù? Ø·Ù?Ø± ØºÛ?Ø± Ù?Ù?ØªØ¸Ø±Ù? Ø®Ø§Ø±Ø¬ Ø´Ø¯. Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Ù? Ø¹Ù?Øª Û?Ú© Ø§Ø´Ú©Ø§Ù? Ø¯Ø± Tor Ù? Û?Ø§ Û?Ú© Ø¨Ø±Ù?Ø§Ù?Ù? Ø¯Û?Ú¯Ø± Ø¨Ø± Ø±Ù?Û? Ø³Û?Ø³ØªÙ? Ø´Ù?Ø§ Ù? Û?Ø§ Û?Ú© Ø³Ø®Øª Ø§Ù?Ø²Ø§Ø± Ù?Ø¹Û?Ù?Ø¨ Ø§ØªÙ?Ø§Ù? Ø§Ù?ØªØ§Ø¯Ù? Ø¨Ø§Ø´Ø¯Ø? ØªØ§ Ø²Ù?Ø§Ù?Û? Ú©Ù? Ø¯Ù?Ø¨Ø§Ø±Ù? Tor Ø±Ø§ Ø§Ø¬Ø±Ø§ Ù?Ù?Ø§Ø¦Û?Ø¯. Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ù?Ø§Ø¯Ø± Ø§Ø³Øª Ø¨Ù? Ù?Ø± Ø³Ø§Û?ØªÛ? Ø¯Ø³ØªØ±Ø³Û? Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Ø¯. Ø§Ú¯Ø± Ø§Û?Ù? Ù?Ø´Ú©Ù? Ø§Ø¯Ø§Ù?Ù? Ø¯Ø§Ø´ØªØ? Ù?Ø·Ù?Ø§ Û?Ú© Ú©Ù¾Û? Ø§Ø² Log Tor Ø®Ù?Ø¯ Ø±Ø§ Ø¨Ù? ØªÛ?Ù? Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯.
+torlauncher.tor_exited2=Ø´Ø±Ù?Ø¹ Ù?Ø¬Ø¯Ø¯Ø? Tor Ù?Ù?Û? ØªÙ?Ø§Ù?Ø¯ Ø²Ø¨Ø§Ù?Ù? Ù?Ø§Û? Ù?Ø±Ù?Ø±Ú¯Ø± Ø±Ø§ Ø¨Ø¨Ù?Ø¯Ø¯.
 torlauncher.tor_controlconn_failed=Ø§ØªØµØ§Ù? Ø¨Ù? Ù¾Ù?Ø±Øª Ú©Ù?ØªØ±Ù? ØªÙ?Ø± Ø§Ù?Ú©Ø§Ù? Ù¾Ø°Û?Ø± Ù?Ù?Û?â??Ø¨Ø§Ø´Ø¯.
 torlauncher.tor_failed_to_start=Ø®Ø·Ø§ Ø¯Ø± Ø±Ø§Ù? Ø§Ù?Ø¯Ø§Ø²Û?.
 torlauncher.tor_control_failed=Ø¨Ù?â??Ø¯Ø³Øª Ú¯Ø±Ù?ØªÙ? Ú©Ù?ØªØ±Ù? ØªÙ?Ø± Ù?Ø§Ù?Ù?Ù?Ù? Ø¨Ù?Ø¯.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Ù?Û?Ú? Ù¾Ù?Û? Ø§Ø² Ù?Ù?Ø¹ %S  Ù?Ù?Ø¬Ù?
 torlauncher.recommended_bridge=(ØªÙ?ØµÛ?Ù? Ø´Ø¯Ù?)
 
 torlauncher.connect=Ø§ØªØµØ§Ù?
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=ØªÙ?Ø± Ø±Ø§ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø´Ù?Ø±Ù?Ø¹ Ú©Ù?Û?Ø¯.
 torlauncher.quit=Ø®Ø±Ù?Ø¬
 torlauncher.quit_win=Ø®Ø±Ù?Ø¬
 torlauncher.done=Ø§Ù?Ø¬Ø§Ù? Ø´Ø¯
 
 torlauncher.forAssistance=Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ú©Ù?Ú©Ù« Ø¨Ø§ %S ØªÙ?Ø§Ø³ Ø¨Ú¯Û?Ø±Û?Ø¯
 
+torlauncher.copiedNLogMessages=Ú©Ù¾Û? Ú©Ø§Ù?Ù? Ø´Ø¯. %S Ù¾Û?Ø§Ù?Ù?Ø§Û? Ø«Ø¨Øª Ø´Ø¯Ù? Ø¢Ù?Ø§Ø¯Ù? Ø§Ø³Øª ØªØ§ Paste Ø´Ù?Ø¯ Ø¯Ø± Ù?Û?Ø±Ø§Û?Ø´Ú¯Ø± Ù?ØªÙ? Û?Ø§ Û?Ú© Ø§Û?Ù?Û?Ù?.
+
 torlauncher.bootstrapStatus.conn_dir=Ø§ØªØµØ§Ù? Ø¨Ù? Û?Ú© Ù?Ù?Ø±Ø³Øª Ø¨Ø§Ø²Ù¾Ø®Ø´
 torlauncher.bootstrapStatus.handshake_dir=Ø¨Ø±Ù¾Ø§Û?Û? Û?Ú© Ø§ØªØµØ§Ù? Ù?Ù?Ø±Ø³Øª Ø±Ù?Ø²Ø¨Ù?Ø¯Û? Ø´Ø¯Ù?
 torlauncher.bootstrapStatus.requesting_status=Ø¨Ø§Ø²Û?Ø§Ø¨Û? Ù?Ø¶Û?Ø¹Øª Ø´Ø¨Ú©Ù?
diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd
index f8d6644..c8fb8f7 100644
--- a/src/chrome/locale/fi/network-settings.dtd
+++ b/src/chrome/locale/fi/network-settings.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torsettings.dialog.title "Torin Verkkoasetukset">
+<!ENTITY torsettings.dialog.title "Tor-verkkoasetukset">
 
 <!-- For "first run" wizard: -->
 
@@ -8,20 +8,17 @@
 <!ENTITY torSettings.no "Ei">
 
 <!ENTITY torSettings.firstQuestion "MikÃ¤ seuraavista kuvailee parhaiten tilannettasi?">
-<!ENTITY torSettings.configurePrompt1 "TÃ¤mÃ¤n tietokoneen internet yhteys on sensuroitu, suodatettu tai proxattu.">
-<!ENTITY torSettings.configurePrompt2 "Minun tÃ¤ytyy mÃ¤Ã¤rittÃ¤Ã¤ silta-, palomuuri- tai vÃ¤lityspalvelinasetuksia.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "MÃ¤Ã¤ritÃ¤">
-<!ENTITY torSettings.connectPrompt2 "Haluan yhdistÃ¤Ã¤ suoraan Torin verkkoon.">
-<!ENTITY torSettings.connectPrompt3 "TÃ¤mÃ¤ toimii monissa tilanteissa.">
+<!ENTITY torSettings.connectPrompt2 "Haluan yhdistÃ¤Ã¤ suoraan Tor-verkkoon.">
+<!ENTITY torSettings.connectPrompt3 "TÃ¤mÃ¤ toimii useimmissa tilanteissa.">
 <!ENTITY torSettings.connect "YhdistÃ¤">
 
-<!ENTITY torSettings.proxyQuestion "Tarvitseeko tÃ¤mÃ¤ tietokone proxya pÃ¤Ã¤stÃ¤kseen internettiin?">
+<!ENTITY torSettings.proxyQuestion "Tarvitseeko tÃ¤mÃ¤ tietokone vÃ¤lityspalvelinta pÃ¤Ã¤stÃ¤kseen internettiin?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "Ellet ole varma, kuinka vastata tÃ¤hÃ¤n kysymykseen, katso Internet asetukset toisessa selaimessa nÃ¤hdÃ¤ksesi onko se mÃ¤Ã¤ritetty kÃ¤yttÃ¤mÃ¤Ã¤n vÃ¤lityspalvelinta.">
-<!ENTITY torSettings.enterProxy "Mene proxy asetuksiin.">
-<!ENTITY torSettings.firewallQuestion "Kulkeeko tietokoneen Internet-yhteys palomuurin lÃ¤pi, joka hyvÃ¤ksyy yhteydet ainoastaan tiettyihin portteihin?">
-<!ENTITY torSettings.firewallHelp "Ellet ole varma kuinka vastata tÃ¤hÃ¤n kysymykseen, valitse Ei. Muuta tÃ¤tÃ¤ asetusta jos yhteyden saamisessa Tor-verkkoon on ongelmia.">
-<!ENTITY torSettings.enterFirewall "Luettele pilkuin erotettuina ne portit, jotka palomuuri sallii. ">
+<!ENTITY torSettings.proxyHelp "Ellet ole varma, kuinka vastata tÃ¤hÃ¤n kysymykseen, katso Internet-asetukset toisessa selaimessa nÃ¤hdÃ¤ksesi onko se mÃ¤Ã¤ritetty kÃ¤yttÃ¤mÃ¤Ã¤n vÃ¤lityspalvelinta.">
+<!ENTITY torSettings.enterProxy "Kirjoita vÃ¤lityspalvelinasetukset.">
 <!ENTITY torSettings.bridgeQuestion "Sensuroiko tai estÃ¤Ã¤kÃ¶ sinun operaattorisi (ISP) yhteydet Tor-verkkoon?">
 <!ENTITY torSettings.bridgeHelp "Ellet ole varma kuinka vastata tÃ¤hÃ¤n kysymykseen, valitse No.&#160; Jos valitset KyllÃ¤, sinua pyydetÃ¤Ã¤n mÃ¤Ã¤rittÃ¤mÃ¤Ã¤n Torin Sillat, jotka ovat listaamattomia releitÃ¤, jotta yhteyksiÃ¤ olisi vaikeampi estÃ¤Ã¤ Torin verkkoon yhdistettÃ¤essÃ¤.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Voit kÃ¤yttÃ¤Ã¤ edellytettyjÃ¤ silta-yhteyksiÃ¤ tai voit saada ja osallistua mukautettuihin siltasarjaan.">
@@ -33,32 +30,33 @@
 
 <!ENTITY torsettings.optional "Vaihtoehtoinen">
 
-<!ENTITY torsettings.useProxy.checkbox "TÃ¤mÃ¤ tietokone tarvitsee kÃ¤yttÃ¤Ã¤ proxya pÃ¤Ã¤stÃ¤kseen internettiin.">
-<!ENTITY torsettings.useProxy.type "Proxy tyyppi:">
+<!ENTITY torsettings.useProxy.checkbox "TÃ¤mÃ¤n tietokoneen on kÃ¤ytettÃ¤vÃ¤ vÃ¤lityspalvelinta pÃ¤Ã¤stÃ¤kseen internettiin.">
+<!ENTITY torsettings.useProxy.type "VÃ¤lityspalvelintyyppi:">
 <!ENTITY torsettings.useProxy.address "Osoite:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP osoite tai isÃ¤nnÃ¤n nimi">
+<!ENTITY torsettings.useProxy.address.placeholder "IP-osoite tai palvelinnimi">
 <!ENTITY torsettings.useProxy.port "Portti:">
-<!ENTITY torsettings.useProxy.username "KÃ¤yttÃ¤jÃ¤nimi:">
+<!ENTITY torsettings.useProxy.username "KÃ¤yttÃ¤jÃ¤tunnus:">
 <!ENTITY torsettings.useProxy.password "Salasana:">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "TÃ¤mÃ¤n tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta.">
+<!ENTITY torsettings.firewall.checkbox "TÃ¤mÃ¤n tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta">
 <!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:">
-<!ENTITY torsettings.useBridges.checkbox "Minun internet-yhteyden tarjoaja (ISP) estÃ¤Ã¤ yhteydet Tor verkkoon.">
-<!ENTITY torsettings.useBridges.default "Yhteys edellytetyillÃ¤ silloilla.">
+<!ENTITY torsettings.useBridges.checkbox "Minun internet-yhteyden tarjoajani (ISP) estÃ¤Ã¤ yhteydet Tor-verkkoon">
+<!ENTITY torsettings.useBridges.default "YhdistÃ¤ tarjotuilla silloilla">
 <!ENTITY torsettings.useBridges.type "Siirtotyyppi:">
 <!ENTITY torsettings.useBridges.custom "Mene mukautettuihin siltoihin">
 <!ENTITY torsettings.useBridges.label "Mene yhteen tai useampaan silta releeseen (yksi per rivi).">
 <!ENTITY torsettings.useBridges.placeholder "syÃ¶tÃ¤ osoite:portti">
 
-<!ENTITY torsettings.copyLog "Kopioi Torin Loki LeikepÃ¶ydÃ¤lle">
+<!ENTITY torsettings.copyLog "Kopioi Tor-loki leikepÃ¶ydÃ¤lle">
 <!ENTITY torsettings.bridgeHelpTitle "Siltarele-apu">
 <!ENTITY torsettings.bridgeHelp1 "Jos et pysty yhdistÃ¤mÃ¤Ã¤n Torin verkkoon, syy voi olla, ettÃ¤ Internet palveluntarjoajasi (ISP) tai muu taho estÃ¤Ã¤ Tor.&#160; Usein, voit kiertÃ¤Ã¤ tÃ¤mÃ¤n ongelman kÃ¤yttÃ¤mÃ¤llÃ¤ Torin siltoja, jotka ovat listaamattomia releitÃ¤, jotka on vaikeampi estÃ¤Ã¤.">
 <!ENTITY torsettings.bridgeHelp1B "Voit kÃ¤yttÃ¤Ã¤ esimÃ¤Ã¤ritettyjÃ¤, edellytettyjÃ¤ siltaosoitesarjoja tai voit saada mukautetun osoitesarjan kÃ¤yttÃ¤mÃ¤llÃ¤ nÃ¤itÃ¤ kolmea menetelmÃ¤Ã¤:">
 <!ENTITY torsettings.bridgeHelp2Heading "Verkon yli">
 <!ENTITY torsettings.bridgeHelp2 "KÃ¤ytÃ¤ internet-selainta vieraillaksesi osoitteessa: https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "SÃ¤hkÃ¶postin Automaattivastaajan lÃ¤pi">
-<!ENTITY torsettings.bridgeHelp3 "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia: bridges@xxxxxxxxxxxxxx tekstin kanssa 'get bridges'  160">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia osoitteeseen bridges@xxxxxxxxxxxxxx kÃ¤yttÃ¤en viestissÃ¤ tekstiÃ¤ 'get bridges' pelkÃ¤stÃ¤Ã¤n viestin rungossa.&#160; Kuitenkin, tehdÃ¤ksesi vaikeammaksi siltaosoitteiden opettelu hyÃ¶kkÃ¤Ã¤jÃ¤lle sinun on lÃ¤hetettÃ¤vÃ¤ tÃ¤mÃ¤ pyyntÃ¶ yhdestÃ¤ seuraavista sÃ¤hkÃ¶postipalveluiden tarjoajan osoitteesta (listattu suosion mukaisessa jÃ¤rjestyksessÃ¤):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com tai https:://mail.yahoo.com">
 <!ENTITY torsettings.bridgeHelp4Heading "Neuvontapisteen lÃ¤pi">
 <!ENTITY torsettings.bridgeHelp4 "ViimeisenÃ¤ keinona voit pyytÃ¤Ã¤ siltaosoitteita lÃ¤hettÃ¤mÃ¤llÃ¤ kohteliaan viestin osoitteeseen: help@xxxxxxxxxxxxxxxxxx&#160; Huomioi, ettÃ¤ henkilÃ¶n tulee vastata kuhunkin pyyntÃ¶Ã¶n.">
diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties
index 21ade8d..f6491b9 100644
--- a/src/chrome/locale/fi/torlauncher.properties
+++ b/src/chrome/locale/fi/torlauncher.properties
@@ -3,25 +3,25 @@
 
 torlauncher.error_title=Tor-kÃ¤ynnistin
 
-torlauncher.tor_exited=Tor lopetti toimintansa yllÃ¤ttÃ¤en.
-torlauncher.tor_connection_lost=Yhteytesi Tor-verkkoon on katkennut.
-torlauncher.tor_controlconn_failed=Ei voi ottaa yhteyttÃ¤ Tor-hallintaporttiin.
-torlauncher.tor_failed_to_start=Tor ei kÃ¤ynnistynyt.
+torlauncher.tor_exited=Tor sammui odottamatta. TÃ¤mÃ¤ voi olla virhe Torissa itsessÃ¤Ã¤n, tai toisen ohjelman jÃ¤rjestelmÃ¤ssÃ¤si aiheuttama, tai laitteistovirhe. Tor ei kykene tavoittamaan yhtÃ¤Ã¤n verkkosivua, jos et kÃ¤ynnistÃ¤ Toria uudelleen. Jos tÃ¤mÃ¤ ongelma jatkuu, lÃ¤hetÃ¤ kopio Torin lokitiedostosta tukiryhmÃ¤lle.
+torlauncher.tor_exited2=Torin kÃ¤ynnistÃ¤minen uudestaan ei sulje selaimesi vÃ¤lilehtiÃ¤.
+torlauncher.tor_controlconn_failed=Yhteydenotto Torin hallintaporttiin epÃ¤onnistui.
+torlauncher.tor_failed_to_start=Torin kÃ¤ynnistys epÃ¤onnistui.
 torlauncher.tor_control_failed=Torin haltuun ottaminen epÃ¤onnistui.
-torlauncher.tor_bootstrap_failed=Tor ei saanut yhteyttÃ¤ Tor-verkkoon.\n\n%S
-torlauncher.tor_bootstrap_failed_details=%1$S EpÃ¤onnistui (%2$S).
+torlauncher.tor_bootstrap_failed=Yhteyden muodostaminen Tor-verkkoon epÃ¤onnistui.
+torlauncher.tor_bootstrap_failed_details=%1$S epÃ¤onnistui (%2$S).
 
-torlauncher.unable_to_start_tor=Toria ei voi kÃ¤ynnistÃ¤Ã¤.\n\n%S
+torlauncher.unable_to_start_tor=Torin kÃ¤ynnistys epÃ¤onnistui.\n\n%S
 torlauncher.tor_missing=Suoritettava Tor-tiedosto puuttuu.
 torlauncher.torrc_missing=Tiedosto torrc puuttuu.
-torlauncher.datadir_missing=Tor on kadottanut yhteyden tietokantaan.
-torlauncher.password_hash_missing=Salasanan varmistussummaa ei lÃ¶ydy.
+torlauncher.datadir_missing=Tor-tietohakemistoa ei ole.
+torlauncher.password_hash_missing=TiivistettyÃ¤ salasanaa ei lÃ¶ytynyt.
 
-torlauncher.failed_to_get_settings=Tor-asetuksia ei saa ladattua.\n\n%S
-torlauncher.failed_to_save_settings=Tor-asetuksia ei saa tallennettua.\n\n%S
+torlauncher.failed_to_get_settings=Tor-asetusten noutaminen epÃ¤onnistui.\n\n%S
+torlauncher.failed_to_save_settings=Tor-asetusten tallentaminen epÃ¤onnistui.\n\n%S
 torlauncher.ensure_tor_is_running=Varmista, ettÃ¤ Tor on kÃ¤ynnissÃ¤.
 
-torlauncher.error_proxy_addr_missing=Sinun on mÃ¤Ã¤riteltÃ¤vÃ¤ IP-osoite tai verkkonimi sekÃ¤ porttinumero, jotta Tor voi yhdistÃ¤Ã¤ vÃ¤lityspalvelimen kautta Internetiin.
+torlauncher.error_proxy_addr_missing=Sinun on mÃ¤Ã¤riteltÃ¤vÃ¤ sekÃ¤ IP-osoite ettÃ¤ porttinumero tai sekÃ¤ verkkonimi ettÃ¤ porttinumero, jotta Tor voi yhdistÃ¤Ã¤ vÃ¤lityspalvelimen kautta Internetiin.
 torlauncher.error_proxy_type_missing=Sinun on valittava vÃ¤lityspalvelimen tyyppi.
 torlauncher.error_bridges_missing=MÃ¤Ã¤rittele yksi tai useampi silta.
 torlauncher.error_default_bridges_type_missing=Sinun tÃ¤ytyy valita siirtotyyppi tarjotuille silloille.
@@ -30,17 +30,19 @@ torlauncher.error_bridge_bad_default_type=Tarjolla olevissa silloissa ei ole saa
 torlauncher.recommended_bridge=(suositeltu)
 
 torlauncher.connect=YhdistÃ¤
-torlauncher.reconnect=YhdistÃ¤ uudelleen
+torlauncher.restart_tor=KÃ¤ynnistÃ¤ Tor uudelleen
 torlauncher.quit=Lopeta
 torlauncher.quit_win=Lopeta
 torlauncher.done=Valmis
 
 torlauncher.forAssistance=Tukea saat ottamalla yhteyttÃ¤ %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=YhdistetÃ¤Ã¤n reititinhakemistoon
 torlauncher.bootstrapStatus.handshake_dir=Muodostetaan suojattu yhteys hakemistoon
-torlauncher.bootstrapStatus.requesting_status=Noudetaan verkon tilaa
-torlauncher.bootstrapStatus.loading_status=Ladataan verkon tilaa
+torlauncher.bootstrapStatus.requesting_status=Noudetaan verkon tila
+torlauncher.bootstrapStatus.loading_status=Ladataan verkon tila
 torlauncher.bootstrapStatus.loading_keys=Ladataan juurivarmenteita
 torlauncher.bootstrapStatus.requesting_descriptors=PyydetÃ¤Ã¤n reititintietoja
 torlauncher.bootstrapStatus.loading_descriptors=Ladataan reititintietoja
@@ -56,4 +58,4 @@ torlauncher.bootstrapWarning.identity=yhteensopimaton identiteetti
 torlauncher.bootstrapWarning.timeout=yhteys aikakatkaistu
 torlauncher.bootstrapWarning.noroute=ei reittiÃ¤ palvelimelle
 torlauncher.bootstrapWarning.ioerror=luku/kirjoitusvirhe
-torlauncher.bootstrapWarning.pt_missing=Puuttuu kytkettÃ¤vÃ¤ liikenne
+torlauncher.bootstrapWarning.pt_missing=puuttuu kytkettÃ¤vÃ¤ liikenne
diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd
index bd52ca0..41348a6 100644
--- a/src/chrome/locale/fil/network-settings.dtd
+++ b/src/chrome/locale/fil/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Wala">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties
index b69659f..a801b32 100644
--- a/src/chrome/locale/fil/torlauncher.properties
+++ b/src/chrome/locale/fil/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tagapaglunsad ng Tor
 
-torlauncher.tor_exited=Hindi inaasahang tumigil ang Tor.
-torlauncher.tor_connection_lost=Ang iyong koneksyon sa Tor Network ay nawala.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port.
 torlauncher.tor_failed_to_start=Nabigong magsimula ang Tor.
 torlauncher.tor_control_failed=Nabigong kontrolin ang Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Walang maaaring gamitin sa mga ibiniga
 torlauncher.recommended_bridge=(rekomendado)
 
 torlauncher.connect=Kumonekta
-torlauncher.reconnect=Muling kumonekta
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Tumigil
 torlauncher.quit_win=Lumabas
 torlauncher.done=Tapos na
 
 torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Kumokonekta sa isang direktoryo ng relay
 torlauncher.bootstrapStatus.handshake_dir= Itinatatag ang isang naka-encrypt na direktoryo ng koneksyon
 torlauncher.bootstrapStatus.requesting_status=Kinukuha ang katayuan ng network
diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/fo/network-settings.dtd
+++ b/src/chrome/locale/fo/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/fo/torlauncher.properties
+++ b/src/chrome/locale/fo/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd
index e8673f3..5df779b 100644
--- a/src/chrome/locale/fr-CA/network-settings.dtd
+++ b/src/chrome/locale/fr-CA/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Non">
 
 <!ENTITY torSettings.firstQuestion "Laquelle des suivantes dÃ©crit le mieux votre situation?">
-<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurÃ©e, filtrÃ©e ou relayÃ©e par un serveur mandataire.">
-<!ENTITY torSettings.configurePrompt2 "Je dois configurer des paramÃ¨tres de pont, de coupe-feu ou de serveur mandataire.">
+<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurÃ©e ou relayÃ©e.">
+<!ENTITY torSettings.configurePrompt2 "Je dois configurer des paramÃ¨tres de pont ou de serveur mandataire.">
 <!ENTITY torSettings.configure "Configurer">
 <!ENTITY torSettings.connectPrompt2 "Je voudrais me connecter directement au rÃ©seau Tor.">
 <!ENTITY torSettings.connectPrompt3 "Ceci fonctionnera dans la plupart des situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, regarder les paramÃ¨tres Internet d'un autre navigateur afin de voir s'il est configurÃ© pour utiliser un mandataire.">
 <!ENTITY torSettings.enterProxy "Saisir les paramÃ¨tres du serveur mandataire.">
-<!ENTITY torSettings.firewallQuestion "Est-ce que la connexion Internet de cet ordinateur passe par un pare-feu qui n'autorise les connexions que vers certains ports?">
-<!ENTITY torSettings.firewallHelp "Si vous ne savez par comment rÃ©pondre Ã  cette question, choisissez Non. Si vous Ã©prouvez des difficultÃ©s Ã  vous connecter au rÃ©seau Tor, changer ce paramÃ¨tre.">
-<!ENTITY torSettings.enterFirewall "Saisir une liste de ports, sÃ©parÃ©s par des virgules, qui sont autorisÃ©s par le pare-feu.">
 <!ENTITY torSettings.bridgeQuestion "Votre fournisseur de service Internet (FSI) bloque-t-il ou censure-t-il vos connexions au rÃ©seau Tor?">
 <!ENTITY torSettings.bridgeHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, choisissez Non.&#160; Si vous choisissez Oui, on vous demandera de configurer les ponts Tor qui sont des relais non listÃ©s rendant le bloquage des connexions au rÃ©seau Tor plus difficile.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisÃ©.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "par le Web">
 <!ENTITY torsettings.bridgeHelp2 "en utilisant un navigateur Web pour visiter https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "par le rÃ©pondeur automatique de courriel">
-<!ENTITY torsettings.bridgeHelp3 "en envoyant un courriel Ã  bridges@xxxxxxxxxxxxxx avec la ligne Â« get bridges Â» seule dans le corps du message.&#160; Cependant pour compliquer l'obtention des ces adresses de ponts pour un attaqueur, vous devez envoyer la demande depuis une adresse courriel  gmail.com ou yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel Ã  bridges@xxxxxxxxxxxxxx avec la ligne Â« get bridges Â» seule dans le corps du message.&#160; Cependant, afin que cela soit plus difficile pour un attaqueur de dÃ©couvrir de nombreuses adresses de ponts, vous devez envoyer cette demande Ã  partir d'un des fournisseurs de courriel suivants (listÃ©s par ordre de prÃ©fÃ©rence) :">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "par le centre d'assistance">
 <!ENTITY torsettings.bridgeHelp4 "en dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli Ã  help@xxxxxxxxxxxxxxxxxx&#160; Veuillez remarquer qu'une personne devra rÃ©pondre Ã  chaque demande.">
diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties
index 3a5372a..bd66071 100644
--- a/src/chrome/locale/fr-CA/torlauncher.properties
+++ b/src/chrome/locale/fr-CA/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Lanceur Tor
 
-torlauncher.tor_exited=Tor a quittÃ© de maniÃ¨re imprÃ©vue.
-torlauncher.tor_connection_lost=Votre connexion au rÃ©seau Tor a Ã©tÃ© perdue.
+torlauncher.tor_exited=Tor a quittÃ© de maniÃ¨re imprÃ©vue. Ceci peut Ãªtre dÃ» Ã  un bogue dans Tor lui-mÃªme, un autre programme dans votre systÃ¨me ou un matÃ©riel dÃ©fectueux. Jusqu'Ã  ce que vous redÃ©marriez Tor, le navigateur Tor ne sera capable d'atteindre aucun site. Si le problÃ¨me persiste, veuillez envoyer une copie de votre journal de Tor Ã  l'Ã©quipe de soutien.
+torlauncher.tor_exited2=RedÃ©marrer Tor ne fermera par les onglets de votre navigateur.
 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Ã©.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Aucun pont ayant le type de transport
 torlauncher.recommended_bridge=(recommandÃ©)
 
 torlauncher.connect=Se connecter
-torlauncher.reconnect=Se reconnecter
+torlauncher.restart_tor=RedÃ©marrer Tor
 torlauncher.quit=Quitter
 torlauncher.quit_win=Sortir
 torlauncher.done=Fait
 
 torlauncher.forAssistance=Pour l'assistance, contacter %S
 
+torlauncher.copiedNLogMessages=La copie est terminÃ©e. %S messages de journalisation de Tor sont prÃªts Ã  Ãªtre coller dans un Ã©diteur de texte ou un courriel.
+
 torlauncher.bootstrapStatus.conn_dir=Connexion Ã  un annuaire de relais
 torlauncher.bootstrapStatus.handshake_dir=Mise en place d'une connexion chiffrÃ©e Ã  l'annuaire
 torlauncher.bootstrapStatus.requesting_status=RÃ©cupÃ©ration de l'Ã©tat du rÃ©seau
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index 3ebad6c..d82a436 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Non">
 
 <!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes dÃ©crit le mieux votre situationÂ ?">
-<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurÃ©e, filtrÃ©e ou nÃ©cessite un proxy.">
-<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configurer une passerelle, le pare-feu, ou les paramÃ¨tres du proxy.">
+<!ENTITY torSettings.configurePrompt1 "Le connexion internet de cet ordinateur est bloquÃ© ou utilise un proxy.">
+<!ENTITY torSettings.configurePrompt2 "Je doit configurer le pont rÃ©seau ou les paramÃ¨tres du proxy.">
 <!ENTITY torSettings.configure "Configurer">
 <!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au rÃ©seau Tor.">
 <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, vous pouvez regarder les paramÃ¨tres de connexion d'un autre navigateur afin de voir s'il est configurÃ© pour utiliser un proxy.">
 <!ENTITY torSettings.enterProxy "Entrez les paramÃ¨tres de votre proxy.">
-<!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet est filtrÃ© par un pare-feu qui n'autorise les connexions que vers certains ports ?">
-<!ENTITY torSettings.firewallHelp "Si vous ne savez par comment rÃ©pondre Ã  cette question, choisissez Non. Vous pourrez changer ce paramÃ¨tre plus tard en cas de problÃ¨mes de connexion au rÃ©seau Tor.">
-<!ENTITY torSettings.enterFirewall "Entrez la liste de ports, sÃ©parÃ©s par des virgules, qui sont autorisÃ©s par le pare-feu.">
 <!ENTITY torSettings.bridgeQuestion "Est-ce que votre Fournisseur d'AccÃ¨s Internet (FAI) bloque les connexions au rÃ©seau Tor ?">
 <!ENTITY torSettings.bridgeHelp "Si vous ne savez pas comment rÃ©pondre Ã  cette question, choisissez Non.&#160; Si vous choisissez Oui, il vous sera demandÃ© de configurer les bridges Tor qui sont des relais non listÃ©s et qui rendent plus difficile le blocage du rÃ©seau Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les bridges fournis ou bien saisir votre liste de bridges personnels.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Par le Web">
 <!ENTITY torsettings.bridgeHelp2 "Utilisez un navigateur web pour visiter https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Par l'auto-rÃ©pondeur de courrier Ã©lectronique">
-<!ENTITY torsettings.bridgeHelp3 "Envoyer un email Ã  bridges@xxxxxxxxxxxxxx avec la ligne 'get bridges' en elle-mÃªme obtiennent dans le corps du message.&#160; Cependant, pour rendre plus difficile Ã  un attaquant d'apprendre beaucoup d'adresses de pont, vous devez envoyer cette demande depuis une adresse Ã©lectronique gmail.com ou yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyer un e-mail Ã  bridges@xxxxxxxxxxxxxx avec la ligne 'get bridges' dans le corps du message.&#160; Pour rendre plus difficile Ã  un attaquant d'apprendre beaucoup d'adresses de pont, vous devez envoyer cette demande depuis une adresse Ã©lectronique d'un de ces fournisseurs (listÃ©s par ordre de prÃ©fÃ©rence) :">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Par le bureau d'aide">
 <!ENTITY torsettings.bridgeHelp4 "En dernier ressort, vous pouvez demander des adresses de pont en envoyant un message Ã©lectronique poli Ã  help@xxxxxxxxxxxxxxxxxx&#160; Veuillez noter qu'une personne devra rÃ©pondre Ã  chaque demande.">
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index 874e6af..faef49a 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Lanceur Tor
 
-torlauncher.tor_exited=Le programme Tor s'est terminÃ© de maniÃ¨re inatendue.
-torlauncher.tor_connection_lost=Votre connexion Ã  Tor a Ã©tÃ© perdue.
+torlauncher.tor_exited=Tor s'est terminÃ© de maniÃ¨re inattendue. Cela pourrait Ãªtre dÃ» Ã  un bug dans Tor lui-mÃªme, Ã  un autre logiciel sur votre systÃ¨me, ou Ã  un dÃ©faut matÃ©riel. Jusqu'Ã  ce que vous redÃ©marriez Tor, le navigateur Tor sera incapable d'atteindre un site Web. Si le problÃ¨me persiste, veuillez envoyer une copie de votre historique Tor Ã  l'Ã©quipe d'assistance.
+torlauncher.tor_exited2=RedÃ©marrer Tor ne fermera pas les onglets de votre navigateur
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Aucun des bridges fournis n'a le type
 torlauncher.recommended_bridge=(recommandÃ©)
 
 torlauncher.connect=Se connecter
-torlauncher.reconnect=Reconnecter
+torlauncher.restart_tor=Relancer Tor
 torlauncher.quit=Quitter
 torlauncher.quit_win=Sortir
 torlauncher.done=TerminÃ©
 
 torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S
 
+torlauncher.copiedNLogMessages=Copie terminÃ©e. %S messages du journal Tor sont prÃªt Ã  Ãªtre collÃ©s dans votre Ã©diteur de texte ou dans un mail.
+
 torlauncher.bootstrapStatus.conn_dir=Connexion Ã  un annuaire de relais
 torlauncher.bootstrapStatus.handshake_dir=Ã?tablissement d'une connexion annuaire chiffrÃ©e
 torlauncher.bootstrapStatus.requesting_status=RÃ©cupÃ©ration de l'Ã©tat du rÃ©seau
diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/fur/network-settings.dtd
+++ b/src/chrome/locale/fur/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/fur/torlauncher.properties
+++ b/src/chrome/locale/fur/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/fy/network-settings.dtd
+++ b/src/chrome/locale/fy/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/fy/torlauncher.properties
+++ b/src/chrome/locale/fy/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ga/network-settings.dtd
+++ b/src/chrome/locale/ga/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ga/torlauncher.properties
+++ b/src/chrome/locale/ga/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd
index 2d70aac..6586f28 100644
--- a/src/chrome/locale/gl/network-settings.dtd
+++ b/src/chrome/locale/gl/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Non">
 
 <!ENTITY torSettings.firstQuestion "Cal das seguintes alternativas describe mellor a sÃºa situaciÃ³n?">
-<!ENTITY torSettings.configurePrompt1 "A conexiÃ³n Ã¡ Internet deste computador Ã© censurada, filtrada ou pasa por un proxy.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configurar">
 <!ENTITY torSettings.connectPrompt2 "GustarÃame conectar directamente Ã¡ rede Tor">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Se non estÃ¡ seguro de como responder a esta pregunta, consulte as opciÃ³ns de Internet en outro navegador para ver se estÃ¡ configurado para usar un proxy.">
 <!ENTITY torSettings.enterProxy "Introduza a configuraciÃ³n do proxy.">
-<!ENTITY torSettings.firewallQuestion "A conexiÃ³n Ã¡ Internet deste computador pasa por unha devasa (firewall) que sÃ³ permite conexiÃ³ns a certos portos?">
-<!ENTITY torSettings.firewallHelp "Se non estÃ¡ seguro de como responder a esta pregunta, seleccione Non. Se atopa problemas para conectarse Ã¡ rede Tor, cambie esta configuraciÃ³n.">
-<!ENTITY torSettings.enterFirewall "Escriba unha lista separada por comas de portos permitidos pola devasa (firewall).">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties
index c0a6d84..038d926 100644
--- a/src/chrome/locale/gl/torlauncher.properties
+++ b/src/chrome/locale/gl/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Lanzador do Tor
 
-torlauncher.tor_exited=O Tor saÃu de vez.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recomendado)
 
 torlauncher.connect=Conectar
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Abandoar
 torlauncher.quit_win=SaÃr 
 torlauncher.done=Feito
 
 torlauncher.forAssistance=Para obter asistencia, pÃ³Ã±ase en contacto con %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Conectando co directorio de repetidores
 torlauncher.bootstrapStatus.handshake_dir=Estabelecendo unha conexiÃ³n cifrada co directorio
 torlauncher.bootstrapStatus.requesting_status=Recuperando o estado da rede
diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/gu-IN/network-settings.dtd
+++ b/src/chrome/locale/gu-IN/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/gu-IN/torlauncher.properties
+++ b/src/chrome/locale/gu-IN/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd
index 41cc87f..47d5383 100644
--- a/src/chrome/locale/gu/network-settings.dtd
+++ b/src/chrome/locale/gu/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/gu/torlauncher.properties
+++ b/src/chrome/locale/gu/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/gun/network-settings.dtd
+++ b/src/chrome/locale/gun/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/gun/torlauncher.properties
+++ b/src/chrome/locale/gun/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ha/network-settings.dtd
+++ b/src/chrome/locale/ha/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ha/torlauncher.properties
+++ b/src/chrome/locale/ha/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd
index cebbcc4..e377cdf 100644
--- a/src/chrome/locale/he/network-settings.dtd
+++ b/src/chrome/locale/he/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "×?×?">
 
 <!ENTITY torSettings.firstQuestion "×?×?×?×? ×?×? ×?×?×?×?×? ×?×ª×?×¨ ×?×ª ×?×?×¦×? ×©×?×? ×?×?×?×¤×? ×?×?×?×? ×?×?×?×ª×¨?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "×?×?×?×¨">
 <!ENTITY torSettings.connectPrompt2 "×?×¨×¦×?× ×? ×?×?×ª×?×?×¨ ×?×©×?×¨×?×ª ×?×? ×?×¨×©×ª Tor.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "×?×?×? ×?×ª ×?×?×?×¨×?×ª ×?×¤×¨×?×§×¡×?.">
-<!ENTITY torSettings.firewallQuestion "×?×?×? ×?×?×?×?×¨ ×?×?×?× ×?×¨× ×? ×©×? ×?×?×©×? ×?×? ×¢×?×?×¨ ×?×¨×? ×?×?×?×ª ×?×© ×©×¨×§ ×?×?×¤×©×¨ ×?×?×?×?×¨×?×? ×?×?×¦×?×?×?×ª ×?×¡×?×?×?×?×ª?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "×?×?×ª×?×? ×?×¢×ª ×¢×?×?×¨ Tor ×?×?×? ×?×?×ª×?×?×?â?¦">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "×?×ª×?×? ×?×?×?×© ×?×ª Tor">
 
 <!ENTITY torsettings.optional "×¨×©×?×ª">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties
index ddc5d61..55224f5 100644
--- a/src/chrome/locale/he/torlauncher.properties
+++ b/src/chrome/locale/he/torlauncher.properties
@@ -3,12 +3,12 @@
 
 torlauncher.error_title=×?×©×?×¨ Tor
 
-torlauncher.tor_exited=â??Tor ×?×¦×? ×?×?×¤×ª×?×¢×?.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=×?×ª×?×?×? ×?×?×?×© ×©×? Tor ×?×? ×ª×¡×?×?×¨ ×?×ª ×?×¨×?×?×¡×?×?×ª ×?×?×¤×?×¤×? ×©×?×?.
 torlauncher.tor_controlconn_failed=×?×? ×?×¦×?×?×? ×?×?×ª×?×?×¨ ×?×?×¦×?×?×ª ×©×?×?×?×ª Tor.
 torlauncher.tor_failed_to_start=Tor × ×?×©×? ×?×?×¤×¢×?×?.
-torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
+torlauncher.tor_control_failed=× ×?×©×? ×?×§×?×? ×©×?×?×?×? ×¢×? Tor.
+torlauncher.tor_bootstrap_failed=Tor × ×?×©×? ×?×?×¡×¡ ×?×?×?×?×¨ ×¨×©×ª Tor.
 torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=×?×?×? ×?×¤×©×¨×?×ª ×?×?×ª×?×?×? ×?×ª Tor.\n\n%S
@@ -27,16 +27,18 @@ torlauncher.error_bridges_missing=×¢×?×?×? ×?×¦×?×?×? ×?×©×¨ ×?×?×? ×?×? ×?×?×ª
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(×?×?×?×?×¥)
 
 torlauncher.connect=×?×ª×?×?×¨
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=×?×ª×?×? ×?×?×?×© ×?×ª Tor
 torlauncher.quit=×?×¦×?×?×?
 torlauncher.quit_win=×¦×?
 torlauncher.done=×?×?×©×?×?
 
 torlauncher.forAssistance=×?×¢×?×¨×?, ×¦×¨×? ×§×©×¨ ×¢×? %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=×?×ª×?×?×¨ ×?×¢×ª ×?×? ×?×?×?×¨ ×?×?×¡×¨
 torlauncher.bootstrapStatus.handshake_dir=×?×§×?×? ×?×¢×ª ×?×?×?×?×¨ ×¡×¤×¨×?×?×ª ×?×?×¦×¤×?
 torlauncher.bootstrapStatus.requesting_status=×?×?×ª×¨ ×?×¢×ª ×?×ª ×?×¦×? ×?×¨×©×ª
diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd
index 4a31e93..f8d4548 100644
--- a/src/chrome/locale/hi/network-settings.dtd
+++ b/src/chrome/locale/hi/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "à¤¨à¤¹à¥?à¤?">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/hi/torlauncher.properties
+++ b/src/chrome/locale/hi/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
index 65fe1e6..26c627a 100644
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ b/src/chrome/locale/hr-HR/network-settings.dtd
@@ -9,8 +9,8 @@ internetskoj vezi ovog raÄ?unala.">
 <!ENTITY torSettings.no "Ne">
 
 <!ENTITY torSettings.firstQuestion "Koje od sljedeÄ?eg najbolje opisuje VaÅ¡u situaciju?">
-<!ENTITY torSettings.configurePrompt1 "Internetska veza ovog raÄ?unala je cenzurirana, filtrirana ili prolazi kroz proxy.">
-<!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati bridge, firewall ili proxy postavke.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Podesi">
 <!ENTITY torSettings.connectPrompt2 "Å½elim se izravno spojiti na Tor mreÅ¾u.">
 <!ENTITY torSettings.connectPrompt3 "Ovo Ä?e raditi u veÄ?ini situacija.">
@@ -20,9 +20,6 @@ internetskoj vezi ovog raÄ?unala.">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku i provjerite je li podeÅ¡en za koriÅ¡tenje proxyja.">
 <!ENTITY torSettings.enterProxy "Unesite postavke proxyja.">
-<!ENTITY torSettings.firewallQuestion "Prolazi li Internet veza ovog raÄ?unala kroz vatrozid koji dopuÅ¡ta spajanje samo na odreÄ?ene portove?">
-<!ENTITY torSettings.firewallHelp "Ako niste sigurni kako odgovoriti na ovo pitanje, odaberite &quot;Ne&quot;. Ako uoÄ?ite probleme pri spajanju na Tor mreÅ¾u, promijenite ovu postavku.">
-<!ENTITY torSettings.enterFirewall "Unesite popis portova, odvojenih zarezom, koji su dopuÅ¡teni na vatrozidu.">
 <!ENTITY torSettings.bridgeQuestion "Blokira li vaÅ¡ Internet Service Provider (ISP) ili ikako cenzurira veze
 s Tor mreÅ¾om?">
 <!ENTITY torSettings.bridgeHelp "Ako niste sigurni kako da odgovorite na ovo pitanje, odaberite Ne.&#160; Ako odaberete Da, zatraÅ¾it Ä?e vas da konfigurirate Tor Mostove, koji su neizlistani releji koji oteÅ¾avaju
@@ -63,9 +60,8 @@ vlastiti set adresa koristeÄ?i jednu od ove tri metode:">
 <!ENTITY torsettings.bridgeHelp2Heading "Kroz Web">
 <!ENTITY torsettings.bridgeHelp2 "Koristite web preglednik kako bi posjetili https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Kroz Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "PoÅ¡aljite email na bridges@xxxxxxxxxxxxxx samo s tekstom 'get bridges' u sadrÅ¾aju
-poruke.&#160; No, kako bi napadaÄ?ima bilo teÅ¾e nauÄ?iti mnogo bridge adresa, morate
-poslati ovaj zahtjev sa gmail.com ili yahoo.com email adrese.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "PomoÄ?u Help Deska">
 <!ENTITY torsettings.bridgeHelp4 "U najgorem sluÄ?aju, moÅ¾ete zatraÅ¾iti bridge adrese tako Å¡to poÅ¡aljete pristojan email na help@xxxxxxxxxxxxxxxxxx&#160; Imajte na umu da neÄ?e odgovoriti na svaki
 zahtjev.">
diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties
index daa86fa..a59b544 100644
--- a/src/chrome/locale/hr-HR/torlauncher.properties
+++ b/src/chrome/locale/hr-HR/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=PokretaÄ? Tora
 
-torlauncher.tor_exited=Tor je neoÄ?ekivano izaÅ¡ao.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Nema dostupnih pruÅ¾enih mostova koji
 torlauncher.recommended_bridge=(preporuÄ?eno)
 
 torlauncher.connect=Spajanje
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Odustani
 torlauncher.quit_win=Izlaz
 torlauncher.done=Gotovo
 
 torlauncher.forAssistance=Za pomoÄ?, kontaktirajte %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Spajanje na mapu releja
 torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje Å¡ifrirane veze na mapu
 torlauncher.bootstrapStatus.requesting_status=DohvaÄ?anje statusa mreÅ¾e
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index 4f50368..e84fff5 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ne">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "Ovo Ä?e raditi u veÄ?ini situacija.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Unesi proxy postavke.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties
index 54a9c06..0d1c26a 100644
--- a/src/chrome/locale/hr/torlauncher.properties
+++ b/src/chrome/locale/hr/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=PoveÅ¾i se
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ht/network-settings.dtd
+++ b/src/chrome/locale/ht/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ht/torlauncher.properties
+++ b/src/chrome/locale/ht/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd
index 54b862a..5611fc0 100644
--- a/src/chrome/locale/hu/network-settings.dtd
+++ b/src/chrome/locale/hu/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nem">
 
 <!ENTITY torSettings.firstQuestion "A kÃ¶vetkezÅ?k kÃ¶zÃ¼l melyik illik jobban a szituÃ¡ciÃ³hoz?">
-<!ENTITY torSettings.configurePrompt1 "A szÃ¡mÃtÃ³gÃ©p internet kapcsolata cenzÃºrÃ¡zott, szÅ±rt vagy proxy-t hasznÃ¡l.">
-<!ENTITY torSettings.configurePrompt2 "KonfigurÃ¡lni kell a bridge, tÅ±zfal vagy proxy beÃ¡llÃtÃ¡sokat.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "BeÃ¡llÃt">
 <!ENTITY torSettings.connectPrompt2 "SzeretnÃ©k kÃ¶zvetlenÃ¼l kapcsolÃ³dni a Tor hÃ¡lÃ³zathoz.">
 <!ENTITY torSettings.connectPrompt3 "A legtÃ¶bb esetben ez mÅ±kÃ¶dni fog.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ha nem vagy biztos a vÃ¡laszban nÃ©zd meg az Internet beÃ¡llÃtÃ¡sokat egy mÃ¡sik bÃ¶ngÃ©szÅ?ben. NÃ©zd meg van-e proxy hasznÃ¡lat beÃ¡llÃtva.">
 <!ENTITY torSettings.enterProxy "Adja meg a proxy beÃ¡llÃtÃ¡sokat.">
-<!ENTITY torSettings.firewallQuestion "Ezen szÃ¡mÃtÃ³gÃ©p internet kapcsolata tÅ±zfalon halad Ã¡t, mely csak bizonyos portokhoz enged csatlakozni?">
-<!ENTITY torSettings.firewallHelp "Nem biztos abban, hogy hogyan vÃ¡laszoljon erre a kÃ©rdÃ©sre, vÃ¡lassza a 'Nem'-et. Ha problÃ©mÃ¡kba Ã¼tkÃ¶zik a Tor hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡skor, vÃ¡ltoztassa meg ezt a beÃ¡llÃtÃ¡st.">
-<!ENTITY torSettings.enterFirewall "GÃ©pelj be egy vesszÅ?vel elvÃ¡lasztott listÃ¡t a portokrÃ³l amik engedÃ©lyezve vannak a tÅ±zfal Ã¡ltal.">
 <!ENTITY torSettings.bridgeQuestion "Az internet szolgÃ¡ltatÃ³d (ISP) blokkolja vagy cenzÃºrÃ¡zza a kapcsolatot a Tor hÃ¡lÃ³zathoz?">
 <!ENTITY torSettings.bridgeHelp "Ha nem vagy biztos a vÃ¡laszban, vÃ¡laszd a Nem-et.&#160; Ha az Igen-t vÃ¡lasztod neked kell konfigurÃ¡lni a Tor bridges amik nem listÃ¡zott Ã¡tjÃ¡tszÃ³k Ã©s nehezebbÃ© teszik a Tor hÃ¡lÃ³zat kapcsolÃ³dÃ¡sÃ¡nak a blokkolÃ¡sÃ¡t.">
 <!ENTITY torSettings.bridgeSettingsPrompt "HasznÃ¡lhatod a szolgÃ¡ltatott bridge cÃmeket vagy beszerezhetsz egyedi bridge cÃmeket.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Interneten keresztÃ¼l">
 <!ENTITY torsettings.bridgeHelp2 "HasznÃ¡lj egy bÃ¶ngÃ©szÅ?t megnÃ©zni ezt az oldalt: https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Az automata email vÃ¡laszok Ã¡ltal.">
-<!ENTITY torsettings.bridgeHelp3 "KÃ¼ldj emailt a bridges@xxxxxxxxxxxxxx -ra a kÃ¶vetkezÅ? szÃ¶veggel: &quot;get bridges&quot; az emailben.&#160; Hogy egy esetleges tÃ¡madÃ³ informÃ¡ciÃ³ szerzÃ©si esÃ©lyÃ©t nehezÃtse ezt az emailt egy gmail.com vagy yahoo.com email cÃmrÅ?l kÃ¼ldd.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "A tÃ¡mogatÃ¡son keresztÃ¼l.">
 <!ENTITY torsettings.bridgeHelp4 "UtolsÃ³ lehetÅ?sÃ©gkÃ©nt kÃ¼ldj egy udvarias bridge igÃ©nylÅ? emailt ide: help@xxxxxxxxxxxxxxxxxx&#160; LÃ©gyszÃves vedd figyelembe az adott szemÃ©lynek tÃ¶bb emailt kell megvÃ¡laszolnia.">
diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties
index 47d9543..bc73c2b 100644
--- a/src/chrome/locale/hu/torlauncher.properties
+++ b/src/chrome/locale/hu/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor IndÃtÃ³
 
-torlauncher.tor_exited=A Tor vÃ¡ratlanul kilÃ©pett.
-torlauncher.tor_connection_lost=A kapcsolat a Tor hÃ¡lÃ³zattal megszakadt.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Nincs egy hÃd sem aminek az Ã¡tviteli
 torlauncher.recommended_bridge=(ajÃ¡nlott)
 
 torlauncher.connect=CsatlakozÃ¡s
-torlauncher.reconnect=Ã?jrakapcsolÃ³dÃ¡s
+torlauncher.restart_tor=Tor ÃºjraindÃtÃ¡sa
 torlauncher.quit=KilÃ©pÃ©s
 torlauncher.quit_win=KilÃ©pÃ©s
 torlauncher.done=KÃ©sz
 
 torlauncher.forAssistance=SegÃtsÃ©gÃ©r kÃ©rjÃ¼k Ãrjon ide: %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=CsatlakozÃ¡s egy ElosztÃ³ cÃmtÃ¡rhoz
 torlauncher.bootstrapStatus.handshake_dir=TitkosÃtott cÃmtÃ¡rkapcsolat lÃ©trehozÃ¡sa
 torlauncher.bootstrapStatus.requesting_status=HÃ¡lÃ³zat stÃ¡tuszÃ¡nak lekÃ©rdezÃ©se
diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd
index 63d5339..572c45e 100644
--- a/src/chrome/locale/hy-AM/network-settings.dtd
+++ b/src/chrome/locale/hy-AM/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/hy-AM/torlauncher.properties b/src/chrome/locale/hy-AM/torlauncher.properties
index 4cacf25..fc5a3b9 100644
--- a/src/chrome/locale/hy-AM/torlauncher.properties
+++ b/src/chrome/locale/hy-AM/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Õ?Õ«Õ¡Õ¶Õ¡Õ¬
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Õ?Õ¥Õ²Õ¡Ö?Õ¯Õ¥Õ¬
 torlauncher.quit_win=ÔµÕ¬Ö?
 torlauncher.done=Õ?Õ¡Õ¿Ö?Õ¡Õ½Õ¿ Õ§
 
 torlauncher.forAssistance=Õ?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö? Õ¯Õ¡ÕºÕ¾Õ¥Ö? %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/hy/network-settings.dtd
+++ b/src/chrome/locale/hy/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/hy/torlauncher.properties
+++ b/src/chrome/locale/hy/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd
index de5dc49..a391ea8 100644
--- a/src/chrome/locale/ia/network-settings.dtd
+++ b/src/chrome/locale/ia/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties
index 300a337..44c40ed 100644
--- a/src/chrome/locale/ia/torlauncher.properties
+++ b/src/chrome/locale/ia/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quitar
 torlauncher.quit_win=Sortir
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index eac76c4..e1b9efd 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Tidak">
 
 <!ENTITY torSettings.firstQuestion "Yang mana dari di bawah ini cocok dengan situasi anda?">
-<!ENTITY torSettings.configurePrompt1 "Koneksi internet komputer ini disensor, disaring, atau diladeni pewali.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Konfigur">
 <!ENTITY torSettings.connectPrompt2 "Saya ingin menghubungkan secara langsung ke jaringan Tor.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Kalau anda tidak yakin bagaimana menjawab pertanyaan ini, periksalah pengaturan Internet di browser lain untuk melihat apakah dia diatur untuk menggunakan proxy.">
 <!ENTITY torSettings.enterProxy "Masukkan pengaturan proxy.">
-<!ENTITY torSettings.firewallQuestion "Apakah koneksi Internet komputer ini melalui firewall yang hanya memperbolehkan koneksi ke port-port tertentu?">
-<!ENTITY torSettings.firewallHelp "Jika anda tidak yakin atas jawaban pertanyaan ini, pilih Tidak. Jika anda mendapatkan masalah dalam menghubungi network Tor, ubah pengaturan ini.">
-<!ENTITY torSettings.enterFirewall "Masukkan port-port (pisahkan dengan koma) yang diperbolehkan oleh firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/id/progress.dtd b/src/chrome/locale/id/progress.dtd
index c2ea79d..495fdf5 100644
--- a/src/chrome/locale/id/progress.dtd
+++ b/src/chrome/locale/id/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Status Tor ">
 <!ENTITY torprogress.openSettings "Buka Pengaturan">
 <!ENTITY torprogress.heading "Menghubungkan diri ke jaringan Tor">
-<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">
+<!ENTITY torprogress.pleaseWait "Silakan tunggu saat kami membangun koneksi ke jaringan Tor.">
diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties
index 679374c..9151a1a 100644
--- a/src/chrome/locale/id/torlauncher.properties
+++ b/src/chrome/locale/id/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Hubungi
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Berhenti
 torlauncher.quit_win=Keluar
 torlauncher.done=Selesai.
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Menghubungkan diri ke direktori relay
 torlauncher.bootstrapStatus.handshake_dir=Membuat koneksi direktori terenkripsi 
 torlauncher.bootstrapStatus.requesting_status=Mengambil status jaringan
diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd
index 6a7609a..755ae01 100644
--- a/src/chrome/locale/is/network-settings.dtd
+++ b/src/chrome/locale/is/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nei">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties
index d882dc5..409ab33 100644
--- a/src/chrome/locale/is/torlauncher.properties
+++ b/src/chrome/locale/is/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=HÃ¦tta
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index 084c264..69b1821 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Quale delle seguenti descrizioni raffigura meglio la tua situazione?">
-<!ENTITY torSettings.configurePrompt1 "La connessione ad Internet di questo computer Ã¨ censurata, filtrata, o passa attraverso un proxy.">
-<!ENTITY torSettings.configurePrompt2 "Ho bisogno di configurare un bridge, firewall o settaggi proxy.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "Ho bisogno di configurare un ponte o un settaggio proxy">
 <!ENTITY torSettings.configure "Configura">
 <!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor.">
 <!ENTITY torSettings.connectPrompt3 "Questo funzionerÃ  nella maggior parte delle situazioni.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni Internet di un altro browser web per vedere se sia configurato l'uso di un proxy.">
 <!ENTITY torSettings.enterProxy "Inserisci le impostazioni del proxy.">
-<!ENTITY torSettings.firewallQuestion "La connessione ad Internet di questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte?">
-<!ENTITY torSettings.firewallHelp "Se non sei sicuro su come rispondere a questa domanda, seleziona No. Nel caso in cui si verifichino problemi di connessione alla rete Tor, cambia queste impostazioni.">
-<!ENTITY torSettings.enterFirewall "Inserisci una lista di porte consentite dal firewall, separate da una virgola.">
 <!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?">
 <!ENTITY torSettings.bridgeHelp "Se non sei sicuro di come rispondere alla domanda, scegli No.&#160; Se scegli SÃ¬, ti verrÃ  chiesto di configurare Tor Bridges, che consiste in relay non elencati che rendono piÃ¹ difficile bloccare le connessioni alla Rete Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Puoi usare il set preconfigurato di bridge o ottenere ed inserire un set personale di bridge.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Attraverso il web">
 <!ENTITY torsettings.bridgeHelp2 "Usa un browser per visitare https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Attraverso l'autorisponditore Email">
-<!ENTITY torsettings.bridgeHelp3 "Manda una mail a bridges@xxxxxxxxxxxxxx con scritto 'get bridges' nel corpo del messaggio.&#160; Tuttavia, per rendere piÃ¹ difficile il riconoscimento di molti indirizzi bridge, manda questa richiesta da un account gmail.com o yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Invia una email a bridges@xxxxxxxxxxxxxx con scritto 'get bridges' nel corpo del messaggio.&#160; Inoltre, per evitare che un utente maleintenzionato richieda troppi indirizzi bridge, dovrai inviare una richiesta da uno dei seguenti provider di emails (ordinati per preferenza):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Attraverso l'Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Come ultima spiaggia, puoi richiedere un indirizzo bridge mandando una cortese mail a help@xxxxxxxxxxxxxxxxxx&#160; Tieni conto che una persona dovrÃ  rispondere ad ogni singola richiesta.">
diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties
index 731ced4..b5729ed 100644
--- a/src/chrome/locale/it/torlauncher.properties
+++ b/src/chrome/locale/it/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Avviatore di Tor
 
-torlauncher.tor_exited=Tor si Ã¨ arrestato inaspettatamente.
-torlauncher.tor_connection_lost=La tua connesione alla rete Tor Ã¨ stata persa.
+torlauncher.tor_exited=Tor si Ã¨ chiuso inaspettatamente. La causa puÃ² essere un bug dello stesso Tor, un altro programma sul tuo sistema o hardware difettoso. FinchÃ¨ non riavvii Tor, il Tor Browser non potrÃ  connettersi. Se il problema persiste, invia una copia del log di Tor al team di supporto.
+torlauncher.tor_exited2=Il riavvio di Tor non chiuderÃ  le schede del browser.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Non Ã¨ disponibile alcun bridge con il
 torlauncher.recommended_bridge=(raccomandato)
 
 torlauncher.connect=Connetti
-torlauncher.reconnect=Riconnettiti
+torlauncher.restart_tor=Riavvia Tor
 torlauncher.quit=Esci
 torlauncher.quit_win=Esci
 torlauncher.done=Fatto
 
 torlauncher.forAssistance=Per richiedere assistenza, contattare %S
 
+torlauncher.copiedNLogMessages=Copia completata. %S Messaggi di log Tor sono pronti per essere incollato in un editor di testo o un messaggio e-mail.
+
 torlauncher.bootstrapStatus.conn_dir=Connessione ad una directory dei relay
 torlauncher.bootstrapStatus.handshake_dir=Sto creando una connessione cifrata alla directory
 torlauncher.bootstrapStatus.requesting_status=Sto ottenendo informazioni sullo stato della rete
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 7d10085..76034db 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "ã??ã??ã??">
 
 <!ENTITY torSettings.firstQuestion "ä»¥ä¸?ã?®ã??ã?¡ã??ã?ªã??ã?®ç?¶æ??ã?«æ??ã??é?©ã??ã?¦ã??ã??ã?®ã?¯ã?©ã??ã?§ã??ã??ï¼?">
-<!ENTITY torSettings.configurePrompt1 "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?¯æ¤?é?²ã??ã??ã?¦ã??ã??ã??ã??ã??ã?£ã?«ã?¿ã?¼ã??ã??ã?¦ã??ã??ã??ã??ã??ã?ã?ã?·ã??é??ã??ã?¾ã??ã??">
-<!ENTITY torSettings.configurePrompt2 "ã??ã?ªã??ã?¸ã??ã??ã?¡ã?¤ã?¢ã?¼ã?¦ã?©ã?¼ã?«ã??ã??ã?ã?ã?·ã?®è¨å®?ã??æ§?æ??ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??">
+<!ENTITY torSettings.configurePrompt1 "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?¯ã??æ¤?é?²ã??ã??ã?¦ã??ã??ã??ã??ã?ã?ã?·ã??é??ã??ã?¾ã??ã??">
+<!ENTITY torSettings.configurePrompt2 "ã??ã?ªã??ã?¸ã??ã??ã?ã?ã?·ã?®è¨å®?ã??æ§?æ??ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??">
 <!ENTITY torSettings.configure "æ§?æ??">
 <!ENTITY torSettings.connectPrompt2 "Torã??ã??ã??ã?¯ã?¼ã?¯ã?¸ç?´æ?¥æ?¥ç¶?ã??ã?¾ã??ã??">
 <!ENTITY torSettings.connectPrompt3 "ã??ã??ã?¯ã?»ã?¨ã??ã?©ã?®ç?¶æ³?ã?§å??ä½?ã??ã?¾ã??ã??">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "ã??ã?®è³ªå??ã?«ã?©ã??ç?ã??ã??ã?¹ã??ã??ç¢ºä¿¡ã??æ??ã?¦ã?ªã??ã??ã?°ã??Proxyã?®ä½¿ç?¨ã??ã?©ã?®ã??ã??ã?«è¨å®?ã??ã??ã?¦ã??ã??ã??ç¢ºèª?ã??ã??ã??ã??ã?«ã??ä»?ã?®ã??ã?©ã?¦ã?¶ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??è¨å®?ã??è¦?ã?¦ã??ã? ã??ã??ã??">
 <!ENTITY torSettings.enterProxy "Proxyè¨å®?ã??å?¥å??">
-<!ENTITY torSettings.firewallQuestion "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?¯ç?¹å®?ã?®ã??ã?¼ã??ã?¸ã?®æ?¥ç¶?ã?®ã?¿è¨±å?¯ã??ã??ã??ã?¡ã?¤ã?¢ã?¼ã?¦ã?©ã?¼ã?«ã??é??ã??ã?¾ã??ã??ï¼?">
-<!ENTITY torSettings.firewallHelp "ã??ã?®è³ªå??ã?«ã?©ã??ç?ã??ã??ã?¹ã??ã??ç¢ºä¿¡ã??æ??ã?¦ã?ªã??ã??ã?°ã??ã??ã??ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã?? Torã??ã??ã??ã?¯ã?¼ã?¯ã?¸æ?¥ç¶?ã??ã??æ??ã?«å??é¡?ã?«é?é??ã??ã??ã?ªã??ã??ã??ã?®è¨å®?ã??å¤?æ?´ã??ã?¦ã??ã? ã??ã??ã??">
-<!ENTITY torSettings.enterFirewall "ã??ã?¡ã?¤ã?¢ã?¼ã?¦ã?©ã?¼ã?«ã?«ã??ã?£ã?¦è¨±å?¯ã??ã??ã?¦ã??ã??ã??ã?¼ã??ã?®ã?³ã?³ã??å?ºå??ã??ã?®ã?ªã?¹ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??">
 <!ENTITY torSettings.bridgeQuestion "ã??ã?ªã??ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?µã?¼ã??ã?¹ã??ã?ã??ã?¤ã??ã?¼ (ISP) ã?¯ Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã??ã?¦ã??ã??ã??ã??ã??ã??ã??ã?¯å?¥ã?®ã??ã??æ?¹ã?§æ¤?é?²ã??ã?¦ã??ã?¾ã??ã??ï¼?">
 <!ENTITY torSettings.bridgeHelp "ã??ã?®è³ªå??ã?«ã?©ã??ç?ã??ã??ã?¹ã??ã??ã??ã??ã??ã??ã??ã?ªã??å ´å??ã?¯ã??ã??ã??ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??&#160; ã?¯ã??ã??é?¸æ??ã??ã??ã?¨ã??Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã??ã??ã??ã?¨ã??ã??ã??ã?«å?°é?£ã?«ã??ã??ã?ªã?¹ã??å??ã??ã??ã?¦ã??ã?ªã??ã?ªã?¬ã?¼ã?§ã??ã?? Tor Bridges ã??æ§?æ??ã??ã??ã??ã?¨ã??æ±?ã??ã??ã??ã?¾ã??ã??">
 <!ENTITY torSettings.bridgeSettingsPrompt "æ??ä¾?ã??ã??ã??ã??ã?ªã??ã?¸ã?®ã?»ã??ã??ã??ä½¿ç?¨ã??ã??ã??ã??ã??ã??ã??ã?¯ã?«ã?¹ã?¿ã? ã?®ã??ã?ªã??ã?¸ã?®ã?»ã??ã??ã??å??å¾?ã??ã?¦å?¥å??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Torã?®é??å§?ã??å¾?ã?£ã?¦ã??ã?¾ã??...">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Torã??å??èµ·å??ã??ã??">
 
 <!ENTITY torsettings.optional "ã?ªã??ã?·ã?§ã?³">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "ã?¦ã?§ã??çµ?ç?±">
 <!ENTITY torsettings.bridgeHelp2 "ã?¦ã?§ã??ã??ä½¿ç?¨ã??ã?¦ã??https://bridges.torproject.orgã??é??ã??";>
 <!ENTITY torsettings.bridgeHelp3Heading "ã?¡ã?¼ã?«è?ªå??å¿?ç?ã?·ã?¹ã??ã? çµ?ç?±">
-<!ENTITY torsettings.bridgeHelp3 "ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¬æ??ã?« 'get bridges' ã?¨ã??ã??è¡?ã??ä»?ã??ã?¦ bridges@xxxxxxxxxxxxxx ã?«ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã??ã??.&#160;ã??ã? ã??ã??æ?»æ??è??ã??å¤?ã??ã?®ã??ã?ªã??ã?¸ã?¢ã??ã?¬ã?¹ã??æ??æ?¡ã??ã??ã?®ã??å?°é?£ã?«ã??ã??ã??ã??ã?«ã?? gmail.com ã?¾ã??ã?¯ yahoo.com ã?®ã?¡ã?¼ã?«ã?¢ã??ã?¬ã?¹ã??ã??ã??ã?®ã?ªã?¯ã?¨ã?¹ã??ã??é??ä¿¡ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "bridges@xxxxxxxxxxxxxxå®?ã?«get bridgesã?¨ã??ã??æ?¬æ??ã?®ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??&#160; ã??ã? ã??ã??æ?»æ??è??ã?«ã??ã?ªã??ã?¸ã?®ã?¢ã??ã?¬ã?¹ã??ç?¥ã??ã??ã?ªã??ã??ã??ã??ã??ã?®ã?ªã?¯ã?¨ã?¹ã??ã??ä»¥ä¸?ã?®Eã?¡ã?¼ã?«ã??ã?ã??ã?¤ã??ã?¼ã?®ã??ã??ã??ã??ã??ã??é??ä¿¡ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??(è¨å®?ã?®é ?ã?«è¡¨ç¤º):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "ã??ã?«ã??ã??ã?¹ã?¯çµ?ç?±">
 <!ENTITY torsettings.bridgeHelp4 "æ??å¾?ã?®é ¼ã?¿ã?®ç¶±ã?¨ã??ã?¦ã?? help@xxxxxxxxxxxxxxxxx ã?«ä¸?å¯§ã?ªã?¡ã?¼ã?«ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã?¦ã??ã??ã?ªã??ã?¸ã?¢ã??ã?¬ã?¹ã??ã?ªã?¯ã?¨ã?¹ã??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??&#160; äººé??ã??å??ã?ªã?¯ã?¨ã?¹ã??ã?«å¯¾å¿?ã??ã??å¿?è¦?ã??ã??ã??ã??ã?¨ã?«ã??æ³¨æ??ã??ã? ã??ã??ã??">
diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties
index a234677..c679f1d 100644
--- a/src/chrome/locale/ja/torlauncher.properties
+++ b/src/chrome/locale/ja/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Torã?¯äº?æ??ã??ã??çµ?äº?ã??ã?¾ã??ã??ã??
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Torã??çª?ç?¶çµ?äº?ã??ã?¾ã??ã??ã??å??å? ã?¯ã??ã??ã??ã??Torè?ªä½?ã?®ã??ã?°ã??ã??ä»?ã?®å¸¸é§?ã??ã?ã?°ã?©ã? ã??ã??ã??ã??ã??ã?¯ã??ã?¼ã??ã?¦ã?§ã?¢ã?¼ã??å??é¡?ã?§ã??ã??Torã??å??èµ·å??ã??ã??ã?¾ã?§ã??Torã??ã?©ã?¦ã?¶ã?¼ã?¯ã?¦ã?§ã??ã?µã?¤ã??ã?«ä¸?å??æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã??å??èµ·å??ã??ã?¦ã??è§£æ±ºã??ã??ã?ªã??å ´å??ã??Torã?ã?°ã??ã?¡ã?¤ã?«ã??ã?µã??ã?¼ã??ã??ã?¼ã? ã?«é??ä¿¡ã??ã?¦ã??ã? ã??ã??
+torlauncher.tor_exited2=Torã??å??èµ·å??ã??ã?¦ã??ã??ã??ã?ªã??ã?®ã??ã?©ã?¦ã?¶ã?¼ã?¿ã??ã?¯ã??ã?®ã?¾ã?¾æ®?ã??ã?¾ã??ã??
 torlauncher.tor_controlconn_failed=Torã?®ã?³ã?³ã??ã?ã?¼ã?«ã??ã?¼ã??ã?«æ?¥ç¶?å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??ã??
 torlauncher.tor_failed_to_start=Torã?¯é??å§?å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??ã??
 torlauncher.tor_control_failed=Tor ã?®å?¶å¾¡ã?«å¤±æ??ã??ã?¾ã??ã??ã??
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=ã??ã?©ã?³ã?¹ã??ã?¼ã??ã?¿ã?¤ã?? %S ã??
 torlauncher.recommended_bridge=(æ?¨å¥¨)
 
 torlauncher.connect=æ?¥ç¶?
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Torã??å??èµ·å??ã??ã??
 torlauncher.quit=çµ?äº?
 torlauncher.quit_win=çµ?äº?
 torlauncher.done=å®?äº?
 
 torlauncher.forAssistance=ã?µã??ã?¼ã??ã?«ã?¤ã??ã?¦ã?¯ã??%Sã?«ã??å??ã??å??ã??ã??ã??ã? ã??ã??
 
+torlauncher.copiedNLogMessages=ã?³ã??ã?¼æ??å??ã?? %Så??ã?®Torã?ã?°ã??ã?¡ã?¤ã?«ã??ã??ã?ã?¹ã??ã?¨ã??ã?£ã?¿ã?¼ã??Eã?¡ã?¼ã?«ã?«ã??ã?¼ã?¹ã??ã??ã??æº?å??ã??ã?§ã??ã?¾ã??ã??ã??
+
 torlauncher.bootstrapStatus.conn_dir=ã?ªã?¬ã?¼ã??ã?£ã?¬ã?¯ã??ã?ªã?¸æ?¥ç¶?ä¸
 torlauncher.bootstrapStatus.handshake_dir=æ??å?·å??ã??ã??ã??ã??ã?£ã?¬ã?¯ã??ã?ªã?¨ã?®æ?¥ç¶?ã??ç¢ºç«?ä¸
 torlauncher.bootstrapStatus.requesting_status=ã??ã??ã??ã?¯ã?¼ã?¯ã??æ¤?ç´¢ä¸
diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/jv/network-settings.dtd
+++ b/src/chrome/locale/jv/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/jv/torlauncher.properties
+++ b/src/chrome/locale/jv/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ka/torlauncher.properties
+++ b/src/chrome/locale/ka/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/kk/network-settings.dtd
+++ b/src/chrome/locale/kk/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/kk/torlauncher.properties
+++ b/src/chrome/locale/kk/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd
index b5e57a5..bc33bb7 100644
--- a/src/chrome/locale/km/network-settings.dtd
+++ b/src/chrome/locale/km/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "á??á??">
 
 <!ENTITY torSettings.firstQuestion "á??á?¾â??á??á?¶á??â??á??á??á??á??á?¶â??á??á?¶â??á??á?½á??â??â??â??á??á?¼á??â??á??á?¶â??á??á??á??á??á??á??â??á??á??á??â??á??á??á?¢â??á??á??á??á?»á??â??á??á??á??á??á?¶á??á??á??á??á??á?¶á??á??á?¶á??â??á??á??á??á??â??á?¢á??á??á???">
-<!ENTITY torSettings.configurePrompt1 "á??á?¶á??â??á??á??á??á?¶á??á??â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á?»á??á??á??á??á?¼á??á??á??â??á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á??á?? á??á??á??á??á?? á?¬â??á??á?¶á??á??â??á??á??á??á?¼á??á??á??á?¸á??">
-<!ENTITY torSettings.configurePrompt2 "á??á??á??á?»á??â??á??á??á??á?¼á??â??á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á??á??á??â??á??á??á??á??á?¸á??, á??á??á??á??á?¶á??á??â??á??á??á??á?¾á?? á?¬â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¼á??á??á??á?¸á??">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "á??á??á??á??á??á??á??á??á?¶á??á??á??á??á??á??á??á??">
 <!ENTITY torSettings.connectPrompt2 "á??á??á??á?»á??â??á??á??á??á??á??á??á?¶á??á??â??á??á??á??â??á??á??á??á?¶á??á??á??á??â??á??á??á??á??á?¶á?? Tor á??">
 <!ENTITY torSettings.connectPrompt3 "á??á?¶â??á??á?¹á??â??á??á??á??á?¾á??á??á?¶á??â??á??á??á??á?»á??á??á??á??á?¶á??á??á?¶á??â??á??á?¶á??â??á??á??á??á?¾á??á??">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "á??á?¾â??á?¢á??á??á??â??á??á?·á??â??á??á??á??á?¶á??á??â??á?¢á??á??á?¸â??á??á?·á??á?¸â??á??á??á??á?¾á??â??á??á??á??á?½á??â??á??á??á?? á??á?¾á??â??á??á?¶á??á??á??á??á??á??â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á?»á??â??á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??á?? á??á?¾á??á??á??á?¸á??á?¹á??â??á??á?¶á??á?¾â??á??á?¶â??á??á??á??á?¼á??â??á??á?¶á??á??á??á??á??á??á??á??á??á?¶á??á??á??á??á??á??á??á??â??á??á?¾á??á??á??á?¸â??á??á??á??á?¾â??á??á??á??á?¼á??á??á??á?¸â??á??á??á??á?¬á??á??á??">
 <!ENTITY torSettings.enterProxy "á??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¼á??á??á??á?¸á??">
-<!ENTITY torSettings.firewallQuestion "á??á?¾â??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á??á?»á??á??á??á??á?¼á??á??á??â??á??á??á??â??â??á??á??á??á??â??á??á?¶á??á??á??á??á??á??á?¶á??á??â??á??á??á??á?¾á??â??á??á??á??â??á?¢á??á?»á??á??á??á?¶á??â??á??á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á??á??á??á??á??á??â??á??á?¶á??á??á??á?¶á??á???">
-<!ENTITY torSettings.firewallHelp "á??á?¾â??á?¢á??á??á??â??á??á?·á??â??á??á??á??á?¶á??á??â??á??á?·á??á?¸â??á??á??á??á?¾á??á??â??á??á??á??á?½á??â??á??á??á?? á??á??á??á?¾á?? á??á??á?? á??á?¾â??á?¢á??á??á??â??á??á?¶á??â??á??á??á??á? á?¶â??á??á??á??á?»á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á??á??â??á??á??á??á??á?¶á?? Tor á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á??">
-<!ENTITY torSettings.enterFirewall "á??á??á??á??á?¸â??á??á??á??á??á?¸â??á??á??á??á??â??á??á??á??â??á??á??á??á??á??â??á??á??á??â??á??á??á??á??á?¶â??á??á??á??á??á??â??á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á?¢á??á?»á??á??á??á?¶á??â??á??á??á??á??á??á??á??á?¶á??á??â??á??á??á??á?¾á??á??">
 <!ENTITY torSettings.bridgeQuestion "á??á?¾â??á??á??á??á?»á??á? á??á?»á??â??á??á??á??á??á??â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á?? (ISP) á??á??á??á??á??á??á?¶á??á?? á?¬â??á??á?¾â??á??á?·á??â??á??á?¼á??á??á??á??á??â??á??á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á?§á??á??á??á??á??â??á??á?¶á??á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á?¶á?? Tor ?">
 <!ENTITY torSettings.bridgeHelp "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¶á??á??â??á??á?¸â??á??á?·á??á?¸â??á??á??á??á?¾á??â??á??á??á??á?½á??â??á??á??á?? á??á??á??á?¾á??â??á??á??á?? &#160; á??á?¾â??á?¢á??á??á??â??á??á??á??á?¾á??â??á??á?¶á??/á??á?¶á?? á?¢á??á??á??â??á??á?¹á??â??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á?¾â??á?²á??á??â??á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á??á??á??â??á??á??á??á??á?¸á?? Tor á??á??á??â??â??á??á?¶â??á??á?¶á??â??á??á??á??á??á?¼á??â??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á?¶á??â??á??á??á??â??á??á??á??á?¾â??á?²á??á??â??á??á?¶â??á??á?¶á??á??á??á??â??á??á??á??á?¶á??â??â??á??á??á??á?»á??â??á??á?¶á??â??á??á??á??á??á??á??á?¶á??á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á??á??â??á??á??á??á??á?¶á?? Tor á??">
 <!ENTITY torSettings.bridgeSettingsPrompt "á?¢á??á??á??á?¢á?¶á??â??á??á??á??á?¾â??á??á?¶á??á??á??á??á??á??á??á??á??á??á?¸á??â??á??á??á??â??á??á?¶á??á??á??á??á??á?? á?¬â??á?¢á??á??á??â??á?¢á?¶á??â??á??á??â?? á??á?·á??â??á??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á??á??á??á??á??á?¸á??â??á??á??á??á?¶á??á??â??á??á??á??á?½á??á??">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "á??á??á??á?»á??â??á??á??á??á??á?¶á?? Tor á??á?¶á??á??á??á??á??á?¾á??...">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "á??á?¶á??á??á??á??á??á?¾á?? Tor á?¡á?¾á??â??á??á?·á??">
 
 <!ENTITY torsettings.optional "á??á?¶â??á??á??á??á??á?¾á??">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "á??á?¶á??â??á??á??á??â??á??á??á??á??á?¶á??">
 <!ENTITY torsettings.bridgeHelp2 "á??á??á??á?¾â??á??á??á??á??á??á?·á??á?¸á??á?»á??á??á??á??á??á??á??á?¶á?? á??á?¾á??á??á??á?¸á??á?¾á?? https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "á??á?¶á??á??á??á??â??á??á?¶á??á??á??á??á?¾á??á??á??â??á??á??á??â??á??á??á??á??á??â??á??á??á??á??á??á??á??á?·â??á??á??á??á??â??á?¢á??á?¸á??á??á??">
-<!ENTITY torsettings.bridgeHelp3 "á??á??á??á?¾â??á?¢á??á?¸á??á??á??â??á??á?? bridges@xxxxxxxxxxxxxx á??á??á??â??á??á?¶á??â??á??á??á??á?¶ 'get bridges' á??á??á??â??á??á??á??á?½á??â??á??á?¶â??á??á??á??á?»á??â??á??á?½â??á??á?¶á??á??&#160; á??á??á??â??á??á?¶â??á??á??á?¶á??â??á??á?¶â??á??á??â??á??á??á?? á??á?¾á??á??á??á?¸â??á??á??á??á?¾â??á?²á??á??â??á??á?¶â??â??á??á?¶á??á??á??á??â??á??á?·á??á?¶á??â??á??á??á??á??á?¶á??á??â??á?¢á??á??á??â??á??á?¶á??â??á??á??á??á? á?¶á?? á??á?¾á??á??á??á?¸â??á??á?·á??á??á??á?¶â??á??á??á??á?¾á??â??á?¢á??á??á?¸â??á?¢á?¶á??á??á??á??á??á?¶á??â??â??â??á??á??á??á??á?¸á?? á?¢á??á??á??â??á??á??á??á?¼á??â??á??á??á??á?¾â??á??á??á??á?¾â??á??á??á??â??á??á?¸â??á?¢á?¶á??á??á??á??á??á?¶á?? gmail.com á?¬ yahoo.com á??">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "á??á?¶á??á??á??á??â??á??á??á??á?½á??â??">
 <!ENTITY torsettings.bridgeHelp4 "á??á??â??á??á??á??á??á?¾á??â??á??á?»á??á??á??á??á??á?? á?¢á??á??á??â??á?¢á?¶á??â??á??á??á??á?¾â??â??á?¢á?¶á??á??á??á??á??á?¶á??â??á??á??á??á??á?¸á??â??á??á??á??â??á??á??á??á?¾â??á??á?¶á??â??á?¢á??á?¸á??á??á??â??á??á?½á??á??á??â??á??á?? help@xxxxxxxxxxxxxxxxxx&#160; á??á?¼á??â??á??á??á??á?¶á??â??á??á?¶ á??á??á?»á??á??á??â??â??á??á??á??á?¶á??á??â??á??á?¹á??â??á??á??á??á?¼á??â??á??á??á??á?¾á??á??á??â??á??á??â??á??á??á??á?¾â??á??á?¸á??á?½á??á??á??">
diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties
index bd0a264..b93eb81 100644
--- a/src/chrome/locale/km/torlauncher.properties
+++ b/src/chrome/locale/km/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=á??á??á??á??á??á?·á??á?¸â??á??á?¶á??á??á??á??á??á?¾á?? Tor
 
-torlauncher.tor_exited=á??á?¶á??â??á??á??á??á??á?¸ Tor á??á??á??â??á??á?·á??â??á??á??á??á?¹á??â??á??á?»á??
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=á??á?¶á??â??á??á?¶á??á??á??á??á??á?¾á?? Tor á?¡á?¾á??á??á?·á??â??á??á?¹á??â??á??á?·á??â??á??á?·á??â??á??á??á??á?¶á??á??á??á??á??á??á??á?·á??á?¸á??á?»á??á??á??â??á??á??á??á??â??á?¢á??á??á??â??á??á??á??
 torlauncher.tor_controlconn_failed=á??á?·á??â??á?¢á?¶á??â??á??á??á??á?¶á??á??â??á??á??â??á??á??á??á??â??á??á?·á??á?·á??á??á??â??á??á??á??á?? Tor
 torlauncher.tor_failed_to_start=á??á?¶á??â??á??á??á?¶á??á??á??â??á??á??á??á?»á??â??á??á?¶á??â??á??á?¶á??á??á??á??á??á?¾á?? Tor
 torlauncher.tor_control_failed=á??á?¶á??â??á??á??á?¶á??á??á??â??á??á??á??á?»á??â??á??á?¶á??â??á??á?·á??á?·á??á??á?? Tor á??
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=á??á??á??á?¶á??â??á??á??á??á??á?¸á??
 torlauncher.recommended_bridge=(á??á?¶á??â??á??á??á??á??á??â??á?¢á??á?»á??á?¶á??á??á??)
 
 torlauncher.connect=á??á??á??á??á?¶á??á??
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=á??á?¶á??á??á??á??á??á?¾á?? Tor á?¡á?¾á??á??á?·á??
 torlauncher.quit=á??á??á??
 torlauncher.quit_win=á??á?¶á??á??á??á??
 torlauncher.done=á??á?½á??á??á?¶á??á??
 
 torlauncher.forAssistance=á??á??á??á??á?¶á??á??â??á??á??á??á?½á?? á??á?¼á??â??á??á?¶á??á??á??á?? %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=á??á??á??á??á?¶á??á??â??á??á??â??á??á??â??á??á?¶á??â??â??á??á??á??á??á?¼á??â??á??á??á??á??â??
 torlauncher.bootstrapStatus.handshake_dir=á??á??á??á??á?¾á??â??â??á??á?¶á??â??á??á??á??á??á?¶á??á??â??á??á??â??á??á??á??â??á??á?¶á??â??á?¢á??á?·á??á??á??á??á?¸á??
 torlauncher.bootstrapStatus.requesting_status=á??á??â??á??á??â??á??á??á??á?¶á??á??á?¶á??â??á??á??á??á??á?¶á??
diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd
index 61c76e2..7e477e3 100644
--- a/src/chrome/locale/kn/network-settings.dtd
+++ b/src/chrome/locale/kn/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "à²?à²²à³?à²²à²ªà³?à²ª">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties
index 3f563cb..a4ad1c9 100644
--- a/src/chrome/locale/kn/torlauncher.properties
+++ b/src/chrome/locale/kn/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd
index c2ed7fb..1842a05 100644
--- a/src/chrome/locale/ko-KR/network-settings.dtd
+++ b/src/chrome/locale/ko-KR/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "ì??ë??ì?¤">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties
index 7bcdc5a..c793562 100644
--- a/src/chrome/locale/ko-KR/torlauncher.properties
+++ b/src/chrome/locale/ko-KR/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=ë??ê°?ê¸°
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=ì¤?ê³?ì?? ê²½ë¡?ì?? ì?°ê²°í??ê³  ì??ì?´ì??
 torlauncher.bootstrapStatus.handshake_dir=ê²½ë¡?ì??ì?? ì?°ê²°ì?? ì??í?¸í??í?´ì?? ë§?ë?¤ê³  ì??ì?´ì??
 torlauncher.bootstrapStatus.requesting_status=ë?¤í?¸ì??í?¬ ì??í??ë¥¼ ì??ì??ì?¤ê³  ì??ì?´ì??
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index b64c5c1..2dd94b2 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "ì??ë??ì?¤">
 
 <!ENTITY torSettings.firstQuestion "ì?´ë?¤ ê²?ì?´ ê·?í??ì?? ì??í?©ì?? ê°?ê¹?ì?µë??ê¹??">
-<!ENTITY torSettings.configurePrompt1 "ì?´ ì»´í?¨í?°ì?? ì?¸í?°ë?· ì?°ê²°ì?? ê²?ì?´ë??ê±°ë?? í??í?°ë§?ë??ê±°ë?? í??ë¡?ì??ë¥¼ ì?¬ì?©í??ê³  ì??ì?µë??ë?¤.">
-<!ENTITY torSettings.configurePrompt2 "ë¸?ë¦¿ì§?, ë°©í??ë²½, í??ë¡?ì?? ì?¤ì ? êµ¬ì?±ì?? í?´ì?¼ í?©ë??ë?¤.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "êµ¬ì?±">
 <!ENTITY torSettings.connectPrompt2 "Tor ë?¤í?¸ì??í?¬ì?? ì§?ì ? ì?°ê²°í??ê³  ì?¶ì?µë??ë?¤.">
 <!ENTITY torSettings.connectPrompt3 "ì?´ê²?ì?? ë??ë¶?ë¶?ì?? ì??í?©ì??ì?? ë??ì??í?©ë??ë?¤">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "ì?´ ì§?ë¬¸ì?? ì?´ë?»ê²? ë??ë?µí?´ì?¼ í? ì§? í??ì? ì?´ ì??ì§? ì??ì?¼ë©´ í??ë¡?ì??ì?? ì?¬ì?©ì?´ ì?´ë?»ê²? ì?¤ì ?ë??ì?´ ì??ë??ì§? í??ì?¸í??ê¸° ì??í?´ ë?¤ë¥¸ ë¸?ë?¼ì?°ì ?ì?? ì?¸í?°ë?· ì?¤ì ?ì?? ë³´ì?¸ì??.">
 <!ENTITY torSettings.enterProxy "í??ë¡?ì?? ì?¤ì ?ì?? ë?¤ì?´ê°?ë??ë?¤.">
-<!ENTITY torSettings.firewallQuestion "ì?´ ì»´í?¨í?°ì?? ì?¸í?°ë?· ì?°ê²°ì?? ë°©í??ë²½ì?? í?µí?´ì?? í?¹ì ? í?¬í?¸ ì ?ì??ë§? í??ê°?í?©ë??ê¹??">
-<!ENTITY torSettings.firewallHelp "ì?´ ì§?ë¬¸ì?? ì?´ë?»ê²? ë??ë?µí?´ì?¼ í? ì§? í??ì? ì?´ ì??ì§? ì??ì?¼ë©´ ì??ë??ì?¤ë¥¼ ì? í??í??ì?¸ì??. Tor ë?¤í?¸ì??í?¬ì?? ì ?ì??í?  ë?? ë¬¸ì ?ë¥¼ ë§?ë?¬ë?¤ë©´ ì?´ ì?¤ì ?ì?? ë³?ê²½í?´ ì£¼ì?¸ì??.">
-<!ENTITY torSettings.enterFirewall "ë°©í??ë²½ì?? ë?°ë?¼ í??ê°?ë??ê³  ì??ë?? í?¬í?¸ ëª©ë¡? ì??ë ¥í?´ ì£¼ì?¸ì??. í?¬í?¸ ë²?í?¸ë?? ì½¤ë§?ë¡? êµ¬ë¶?ë?©ë??ë?¤.">
 <!ENTITY torSettings.bridgeQuestion "ì?¸í?°ë?· ì??ë¹?ì?¤ ê³µê¸?ì??(ISP)ê°? Tor ë?¤í?¸ì??í?¬ ì ?ì??ì?? ì°¨ë?¨í??ê±°ë?? ê²?ì?´í??ê³  ì??ë??ì???">
 <!ENTITY torSettings.bridgeHelp "ì?´ ì§?ë¬¸ì?? ì?´ë?»ê²? ë??ë?µí?´ì?¼í? ì§? ì?? ëª¨ë¥´ë?? ê²½ì?° ì??ë??ì?¤ë¥¼ ì? í??í??ì?ì??ì?¤.&#160; ì??ë¥¼ ì? í??í??ë©´ Tor ë?¤í?¸ì??í?¬ì?? ë??í?? ì?°ê²°ì?? ì°¨ë?¨í??ë?? ê²?ì?? ë??ì?± ì?´ë µê²?í??ë?? ëª©ë¡? í??ë??ì§? ì??ì?? ë¦´ë ?ì?´ì?´ê³  Tor Bridgesì?? êµ¬ì?±í??ë?? ê²?ì?´ ì??êµ¬ë?©ë??ë?¤.">
 <!ENTITY torSettings.bridgeSettingsPrompt "ì ?ê³µë?? ë¸?ë¦¿ì§? ì?¸í?¸ë¥¼ ì?¬ì?©í??ê±°ë?? ì?¬ì?©ì?? ì§?ì ? ë¸?ë¦¿ì§? ì?¸í?¸ë¥¼ ì·¨ë??í??ì?¬ ì??ë ¥ í?  ì?? ì??ì?µë??ë?¤.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "ì?¹ì?? í?µí?´">
 <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org ë¥¼ ë°©ë¬¸í??ì?ì??ì?¤.">
 <!ENTITY torsettings.bridgeHelp3Heading "ë©?ì?¼ ì??ë?? ì??ë?µ ì??ì?¤í??ì?? í?µí?´">
-<!ENTITY torsettings.bridgeHelp3 "ê³µê°? ë¸?ë¦¿ì§? ì£¼ì??ë¥¼ ì°¾ë?? ë?? í??ë??ì?? ë°©ë²?ì?? ë³¸ë¬¸ì?? 'get bridges'ë?¼ê³  ì ?ì?? E-mailì?? bridges@xxxxxxxxxxxxxx ì??ì?¼ë¡? ë³´ë?´ë?? ê²?ì??ë??ë?¤.&#160; ë?¨, ë¸?ë¦¿ì§? ì£¼ì??ë¥¼ í?¬ë??ì»¤ë?¤ì?´ ì??ì§?í??ê¸° ì?´ë µê²? í??ê¸° ì??í?´  gmail.com ì?´ë?? yahoo.com ì?¼ë¡? ë³´ë?´ì£¼ì??ë©´ ê°?ì?¬í??ê² ì?µë??ë?¤.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "í?¬í?? ë?°ì?¤í?¬ë¥¼ í?µí?´">
 <!ENTITY torsettings.bridgeHelp4 "ìµ?í??ì?? ì??ë?¨ì?¼ë¡? help@xxxxxxxxxxxxxxxxxì?? ì ?ì¤? í?? ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?´ ë¸?ë¦¿ì§? ì£¼ì??ë¥¼ ì??ì²í?  ì?? ì??ì?µë??ë?¤.&#160; ì?¬ë??ì?´ ê°? ì??ì²ì?? ë??ì??í?  í??ì??ê°? ì??ë?¤ë?? ì ?ì?? ì£¼ì??í?´ì£¼ì?ì??ì?¤">
diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties
index d572091..0792dde 100644
--- a/src/chrome/locale/ko/torlauncher.properties
+++ b/src/chrome/locale/ko/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor ë¸?ë?¼ì?°ì ? Launcher
 
-torlauncher.tor_exited=Torê°? ì??ê¸°ì¹? ì??ê²? ì¢?ë£?ë??ì??ì?µë??ë?¤.
-torlauncher.tor_connection_lost=Tor ë?¤í?¸ì??í?¬ ì?°ê²°ì?? ì?¤í?¨í??ì??ì?µë??ë?¤
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Tor ì ?ì?´ í?¬í?¸ì?? ì?°ê²°ì?´ ì?´ë µì?µë??ë?¤.
 torlauncher.tor_failed_to_start=Tor ì??ì?? ì?¤í?¨.
 torlauncher.tor_control_failed=Tor ì ?ì?´ì?? ì?¤í?¨í??ì?µë??ë?¤.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=ì ?ì?¡ ì? í?? %Sê°? ì ?ê³µ í?? ë¸?ë¦¬
 torlauncher.recommended_bridge=(ê¶?ì?¥í?¨)
 
 torlauncher.connect=ì?°ê²°
-torlauncher.reconnect=ì?¬ì?°ê²°
+torlauncher.restart_tor=Tor ì?¬ì??ì??
 torlauncher.quit=ë??ë?´ê¸°
 torlauncher.quit_win=ì¢?ë£?
 torlauncher.done=ì??ë£?
 
 torlauncher.forAssistance=ì§?ì??ì?? ì?°ê²° %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=ì¤?ê³?ì??ë²? ë??ë ?í? ë¦¬ì?? ì?°ê²°
 torlauncher.bootstrapStatus.handshake_dir=ì??í?¸í??ë?? ë??ë ?í?°ë¦¬ ì?°ê²°ì?? ì?¤ì ?
 torlauncher.bootstrapStatus.requesting_status=ë?¤í?¸ì??í?¬ì?? ì??í??ë¥¼ ê°?ì ¸ì?¤ë??ì¤?
diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ku/network-settings.dtd
+++ b/src/chrome/locale/ku/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ku/torlauncher.properties
+++ b/src/chrome/locale/ku/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/kw/network-settings.dtd
+++ b/src/chrome/locale/kw/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/kw/torlauncher.properties
+++ b/src/chrome/locale/kw/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd
index dec8285..a8f724c 100644
--- a/src/chrome/locale/ky/network-settings.dtd
+++ b/src/chrome/locale/ky/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties
index 4f8fbb2..66f9e15 100644
--- a/src/chrome/locale/ky/torlauncher.properties
+++ b/src/chrome/locale/ky/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Ð§Ñ?Ð³Ñ?Ñ?
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/lb/network-settings.dtd
+++ b/src/chrome/locale/lb/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/lb/torlauncher.properties
+++ b/src/chrome/locale/lb/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/lg/network-settings.dtd
+++ b/src/chrome/locale/lg/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/lg/torlauncher.properties
+++ b/src/chrome/locale/lg/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ln/network-settings.dtd
+++ b/src/chrome/locale/ln/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ln/torlauncher.properties
+++ b/src/chrome/locale/ln/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd
index f46473e..b4d3d09 100644
--- a/src/chrome/locale/lo/network-settings.dtd
+++ b/src/chrome/locale/lo/network-settings.dtd
@@ -1,29 +1,26 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.dialog.title "àº?àº²àº?àº?àº±à»?àº?àº?à»?àº²à»?àº?àº·àºàº?à»?àº²àº? Tor">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
+<!ENTITY torsettings.prompt "àº?à»?àºàº?àº?àºµà»?àº?à»?àº²àº?àº?àº°à»?àº?àº·à»?àºàº¡àº?à»?à»?à»?àº?àº»à»?àº²à»?àº?àº·àºàº?à»?àº²àº? Tor, àº?à»?àº²àº?àº?à»?àºàº?à»?àº?à»?à»?àº«à»?àº¥àº²àº?àº¥àº°àºàº½àº?àº?à»?àº½àº§àº?àº±àº? àº?àº²àº?à»?àº?àº·à»?àºàº¡àº?à»?à»? àºàº´àº?à»?àº?àºµà»?àº?àº±àº? àº?àºàº? àº?àº±àºàº¡àº?àº´àº§à»?àº?àºµàº£à»? àº?àºµà»?àº?à»?àºàº?.">
 
-<!ENTITY torSettings.yes "Yes">
-<!ENTITY torSettings.no "No">
+<!ENTITY torSettings.yes "à»?àº¡à»?àº?">
+<!ENTITY torSettings.no "àº?à»?à»?">
 
-<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
-<!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
-<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
-<!ENTITY torSettings.connect "Connect">
+<!ENTITY torSettings.firstQuestion "àºàº±àº?à»?àº? àº?à»?à»?à»?àº?àº?àºµà»? àº?àºµà»? àº?àº±àº?àº?àº²àº? àº¢à»?àº²àº? àº¥àº°àºàº½àº? àº?àºµà»?àºªàº¸àº? àº?à»?àº½àº§àº?àº±àº? àºªàº°àº?àº²àº? àº?àºàº? àº?à»?àº²àº??">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
+<!ENTITY torSettings.configure "àº?àº³àº?àº»àº?àº?à»?àº²">
+<!ENTITY torSettings.connectPrompt2 "àº?à»?àºàº?àº?à»?àºàº?àº?àº²àº?à»?àº?àº·à»?àºàº¡à»?àº?àº?àº?àº»àº?àº?àº±àº?à»?àº?àº·àºàº?à»?àº²àº? Tor.">
+<!ENTITY torSettings.connectPrompt3 "àº?àºµà»?àº?àº°à»?àº?à»?à»?àº?à»?àº?àº±àº?àºªàº°àº?àº²àº?àº°àº?àº²àº?àºªà»?àº§àº?à»?àº«àº?à»?.">
+<!ENTITY torSettings.connect "à»?àº?àº·à»?àºàº¡àº?à»?à»?">
 
-<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">
+<!ENTITY torSettings.proxyQuestion "à»?àº?àº·à»?àºàº?àº?àº±àºàº¡àº?àº´àº§à»?àº?àºµàº£à»?àº?àºµà»? àº?à»?àºàº?àº?àº²àº? à»?àº?à»? àº?àº£àº±àºàº?àº?àºµ à»?àº?àº·à»?àºà»?àº?àº·à»?àºàº¡àº?à»?à»?à»?àº?àº»à»?àº² àºàº´àº?à»?àº?àºµà»?àº?àº±àº? àº?à»?à»??">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
-<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
-<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.proxyHelp "àº?à»?àº²àº?à»?àº²àº?àº?àº±àº?àº?à»?à»?à»?àº?à»?à»?àº?àº§à»?àº²àº?àº°àº?àºàº?àº?à»?àº²àº?àº²àº¡àº?àºµà»?à»?àº?àº§à»?àº?, à»?àº«à»?à»?àº?àº´à»?àº? àº?àº²àº?àº?àº±à»?àº?àº?à»?àº² àºàº´àº?à»?àº?àºµà»?àº?àº±àº? àº¢àº¹à»? àº?àº£àº²àº§à»?àº?àºµàº£à»? à»?àº?àºàº·à»?àº? à»?àº?àº·à»?àºà»?àº?àº´à»?àº?àº§à»?àº² àº¡àº±àº?àº?àº·àº?àº?àº³àº?àº»àº? à»?àº?à»? àº?àº£àº±àºàº?àº?àºµ à»?àº?àº§à»?àº?.">
+<!ENTITY torSettings.enterProxy "àº?à»?àºàº? àº?àº²àº?àº?àº±à»?àº?àº?à»?àº² àº?àº£àº±àºàº?àº?àºµ à»?àº?àº»à»?àº²à»?àº?.">
+<!ENTITY torSettings.bridgeQuestion "àº?àº¹à»?à»?àº«à»?àº?à»?àº¥àº´àº?àº²àº? àºàº´àº?à»?àº?àºµà»?àº?àº±àº? (ISP) àº?àº±àº?à»?àº§à»?àº?à»?à»? àº«àº¼àº·àº?à»?à»? àº?à»?à»?àº¡à»?àº? àº¡àºµàº?àº²àº?àº?àº§àº?àºªàºàº? àº?à»?àºàº?àº?àºµà»?àº?àº°à»?àº?àº·à»?àºàº¡àº?à»?à»?à»?àº?àº»à»?àº²àº?àº±àº?à»?àº?àº·àºàº?à»?àº²àº? Tor?">
+<!ENTITY torSettings.bridgeHelp "àº?à»?àº²àº?à»?àº²àº?àº?àº±àº?àº?à»?à»?à»?àº?à»?à»?àº?àº§à»?àº²àº?àº°àº?àºàº?àº?à»?àº²àº?àº²àº¡àº?àºµà»?à»?àº?àº§à»?àº?, à»?àº«à»?à»?àº¥àº·àºàº? No.&#160; àº?à»?àº²àº?à»?àº²àº?à»?àº¥àº·àº? Yes, àº?à»?àº²àº? àº?àº° àº?àº·àº?àº?àºàº? à»?àº«à»?àº?àº³àº?àº»àº?àº?à»?àº² Tor Bridge àº?àºµà»?àº?à»?à»?à»?àº?à»?àº¢àº¹à»?à»?àº?àº¥àº²àº?àº?àº²àº? àº?àº¶à»?àº?àº?àº°à»?àº®àº±àº?à»?àº«à»?àº«àº?àº¸à»?àº?àº?àº²àº?àº?àº·à»?àº¡ à»?àº?àº?àº²àº?àº?àº±à»?àº? àº?àº²àº?à»?àº?àº·à»?àºàº¡àº?à»?à»?à»?àº?àº»à»?àº²à»?àº?àº·àºàº?à»?àº²àº? Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
 
 <!-- Other: -->
@@ -37,7 +34,7 @@
 <!ENTITY torsettings.useProxy.type "Proxy Type:">
 <!ENTITY torsettings.useProxy.address "Address:">
 <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Port:">
+<!ENTITY torsettings.useProxy.port "àº?àº±àºàº?:">
 <!ENTITY torsettings.useProxy.username "Username:">
 <!ENTITY torsettings.useProxy.password "Password:">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties
index bf2426a..3640155 100644
--- a/src/chrome/locale/lo/torlauncher.properties
+++ b/src/chrome/locale/lo/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -29,14 +29,16 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 
 torlauncher.recommended_bridge=(recommended)
 
-torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.connect=à»?àº?àº·à»?àºàº¡àº?à»?à»?
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index 959d2d9..0e51ad5 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ne">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties
index dedd011..b1f594d 100644
--- a/src/chrome/locale/lt/torlauncher.properties
+++ b/src/chrome/locale/lt/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor nepavyko paleisti.
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(rekomenduojama)
 
 torlauncher.connect=Prisijungti
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Nutraukti
 torlauncher.quit_win=IÅ¡eiti
 torlauncher.done=Atlikta
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo taÅ¡kÅ³
 torlauncher.bootstrapStatus.handshake_dir=UÅ¾mezgiamas ryÅ¡ys
 torlauncher.bootstrapStatus.requesting_status=Nuskaitoma tinklo bÅ«klÄ?
diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd
index bd6aeaf..63b8ede 100644
--- a/src/chrome/locale/lv/network-settings.dtd
+++ b/src/chrome/locale/lv/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "NÄ?">
 
 <!ENTITY torSettings.firstQuestion "Kura situÄ?cija vislabÄ?k atbilst jÅ«sÄ?jai?">
-<!ENTITY torSettings.configurePrompt1 "Å Ä« datora interneta savienojums tiek vai nu cenzÄ?ts, vai filtrÄ?ts, vai arÄ« realizÄ?ts caur starpnieku.">
-<!ENTITY torSettings.configurePrompt2 "Man jÄ?konfigurÄ? tilta, ugunsmÅ«ra vai starpniekservera iestatÄ«jumi.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "KonfigurÄ?t">
 <!ENTITY torSettings.connectPrompt2 "Es vÄ?los tieÅ¡i pieslÄ?gties tÄ«klam Tor.">
 <!ENTITY torSettings.connectPrompt3 "Å is strÄ?dÄ?s vairumÄ? gadÄ«jumu.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ja neesat pÄ?rliecinÄ?ts kÄ?da ir pareizÄ? atbilde, apskatiet cita pÄ?rlÅ«ka interneta iestatÄ«jumus, lai redzÄ?tu vai tas ir konfigurÄ?ts izmantot starpnieku.">
 <!ENTITY torSettings.enterProxy "Ievadiet starpnieka iestatÄ«jumus.">
-<!ENTITY torSettings.firewallQuestion "Vai Å¡Ä« datora interneta savienojums iet caur ugunsmÅ«ri, kurÅ¡ atÄ¼auj savienojumus tikai ar atseviÅ¡Ä·iem portiem?">
-<!ENTITY torSettings.firewallHelp "Ja neesat pÄ?rliecinÄ?ts par pareizo atbildi, izvÄ?lieties atbildi &quot;NÄ?&quot;. Ja rodas problÄ?mas pievienojoties tÄ«klam Tor, mainiet Å¡o iestatÄ«jumu.">
-<!ENTITY torSettings.enterFirewall "Ievadiet ar komatiem atdalÄ«tu ugusnmÅ«ra atÄ¼auto portu sarakstu.">
 <!ENTITY torSettings.bridgeQuestion "Vai JÅ«su interneta pakalpojumu sniedzÄ?js (ISP) bloÄ·Ä? vai savÄ?dÄ?k cenzÄ? savienojumus ar tÄ«klu Tor?">
 <!ENTITY torSettings.bridgeHelp "Ja nezinÄ?t atbildi, izvÄ?lieties No.&#160; ja izvÄ?lÄ?sities JÄ?, Jums lÅ«gs konfigurÄ?t Tor tiltus jeb Tor Bridges, proti, neuzskaitÄ«tus retranslatorus, kuri apgrÅ«tina savienojumu bloÄ·Ä?Å¡anu ar tÄ«klu Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "JÅ«s varat izmantot piedÄ?vÄ?to tiltu kopumu vai varat ievadÄ«t tiltu pielÄ?gotu sarakstu. ">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Gaida, kamÄ?r Tor startÄ?s...">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "RestartÄ?t Tor">
 
 <!ENTITY torsettings.optional "NeobligÄ?ts">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Caur tÄ«mekli">
 <!ENTITY torsettings.bridgeHelp2 "Izmanto pÄ?rlÅ«kprogrammu lai apmeklÄ?tu https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildÄ?tÄ?ju">
-<!ENTITY torsettings.bridgeHelp3 "SÅ«tiet e-pastu uz bridges@xxxxxxxxxxxxxx ar rindu 'get bridges' teksta korpusÄ?.&#160; TaÄ?u, lai uzbrucÄ?jam bÅ«tu sareÅ¾Ä£Ä«tÄ?k uzzinÄ?t daudz tiltu adreÅ¡u, Jums jÄ?sÅ«ta Å¡is pieprasÄ«jums no gmail.com vai yahoo.com e-pasta adreses.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Caur PalÄ«dzÄ«bas Centru">
 <!ENTITY torsettings.bridgeHelp4 "PÄ?dÄ?jÄ?s instances palÄ«dzÄ«ba tiltu adreÅ¡u pieprasÄ«jumiem ir sÅ«tÄ«t pieklÄ?jÄ«gu e-pasta adresi uz help@xxxxxxxxxxxxxxxxxx&#160; LÅ«dzu, Å?emiet vÄ?rÄ?, ka ikvienu pieprasÄ«jumu izskata cilvÄ?ks.">
diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties
index 80e8f61..8be9868 100644
--- a/src/chrome/locale/lv/torlauncher.properties
+++ b/src/chrome/locale/lv/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor palaidÄ?js
 
-torlauncher.tor_exited=Tor negaidÄ«ti beidza darbu.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor negaidÄ«ti beidza darbu. Tas varÄ?ja noteikt dÄ?Ä¼ kÄ¼Å«das paÅ¡Ä? Tor, vai citas programmas JÅ«su sistÄ?mÄ?, vai kÄ¼Å«mes datorÄ?. LÄ«dz brÄ«dim kad JÅ«s restartÄ?siet Tor, Tor nevarÄ?s sasniegt nevienu mÄ?jaslapu. Ja problÄ?ma nepazÅ«d, lÅ«dzu nosÅ«tiet JÅ«su Tor Log atblasta komandai.
+torlauncher.tor_exited2=Tor restartÄ?Å¡ana neaizvÄ?rs jÅ«su pÄ?rlÅ«ka lapas.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Nav piedÄ?vÄ?tu tiltu ar transporta ve
 torlauncher.recommended_bridge=(ieteicami)
 
 torlauncher.connect=Veidot savienojumu
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=RestartÄ?t Tor
 torlauncher.quit=Beigt
 torlauncher.quit_win=Iziet
 torlauncher.done=Gatavs
 
 torlauncher.forAssistance=Lai saÅ?emtu palÄ«dzÄ«bu, sazinieties ar %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Veido savienojumu ar retranslatoru direktoriju
 torlauncher.bootstrapStatus.handshake_dir=Izveido Å¡ifrÄ?tu savienojumu ar direktoriju
 torlauncher.bootstrapStatus.requesting_status=IzgÅ«st tÄ«kla statusu
diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/mg/network-settings.dtd
+++ b/src/chrome/locale/mg/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/mg/torlauncher.properties
+++ b/src/chrome/locale/mg/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/mi/network-settings.dtd
+++ b/src/chrome/locale/mi/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/mi/torlauncher.properties
+++ b/src/chrome/locale/mi/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index a143b50..bf9c0d6 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties
index b708f1f..3b8e9fa 100644
--- a/src/chrome/locale/mk/torlauncher.properties
+++ b/src/chrome/locale/mk/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Ð?Ð·Ð»ÐµÐ·
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ml/torlauncher.properties
+++ b/src/chrome/locale/ml/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/mn/network-settings.dtd
+++ b/src/chrome/locale/mn/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/mn/torlauncher.properties
+++ b/src/chrome/locale/mn/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd
index b599240..9771da3 100644
--- a/src/chrome/locale/mr/network-settings.dtd
+++ b/src/chrome/locale/mr/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties
index d40c2a0..2367cd5 100644
--- a/src/chrome/locale/mr/torlauncher.properties
+++ b/src/chrome/locale/mr/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=à¤?à¥?à¤° à¤²à¤¾à¤?à¤?à¤°
 
-torlauncher.tor_exited=à¤?à¥?à¤° à¤?à¤¨à¤ªà¥?à¤?à¥?à¤·à¤¿à¤¤à¤ªà¤£à¥? à¤¬à¤?à¤¦ à¤?à¤¾à¤²à¥?.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=à¤?à¥?à¤° à¤¨à¤¿à¤¯à¤?à¤¤à¥?à¤°à¤£ à¤ªà¥?à¤°à¥?à¤?à¤²à¤¾ à¤?à¥?à¤¡à¤£à¥?à¤¯à¤¾à¤¤ à¤?à¤ªà¤¯à¤¶.
 torlauncher.tor_failed_to_start=à¤?à¥?à¤° à¤¸à¥?à¤°à¥? à¤¹à¥?à¤£à¥?à¤¯à¤¾à¤¤ à¤?à¤ªà¤¯à¤¶.
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=à¤?à¥?à¤¡à¤¾
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=à¤¬à¤¾à¤¹à¥?à¤° à¤ªà¤¡à¤¾
 torlauncher.quit_win=à¤¬à¤?à¤¦ à¤?à¤°à¤¾
 torlauncher.done=à¤?à¤¾à¤²à¥?
 
 torlauncher.forAssistance=à¤¸à¤¹à¤?à¤¾à¤°à¥?à¤¯à¤¾à¤¸à¤¾à¤ à¥? à¤¸à¤?à¤ªà¤°à¥?à¤? à¤¸à¤¾à¤§à¤¾ : %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd
index 53386ff..35f9827 100644
--- a/src/chrome/locale/ms-MY/network-settings.dtd
+++ b/src/chrome/locale/ms-MY/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Tidak">
 
 <!ENTITY torSettings.firstQuestion "Antara berikut yang manakah terbaik menerangkan keadaan anda?">
-<!ENTITY torSettings.configurePrompt1 "Sambungan internet komputer ini telpas ditapis, atau di-proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Konfigurasi">
 <!ENTITY torSettings.connectPrompt2 "Saya ingin berhubung terus kepada rangkaian Tor.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Jika anda tidak pasti bagaimana untuk menjawab soalan ini, lihat tetapan Internet dalam pelayar yang lain untuk melihat sama ada ia dikonfigurasi untuk menggunakan proksi.">
 <!ENTITY torSettings.enterProxy "Masukkan tetapan proksi.">
-<!ENTITY torSettings.firewallQuestion "Adakah sambungan internet komputer ini melalui firewall yang hanya membenarkan sambungan ke port tertentu?">
-<!ENTITY torSettings.firewallHelp "Jika anda tidak pasti bagaimana untuk menjawab soalan ini, pilih Tidak. Jika anda menghadapi masalah untuk menyambung kepada rangkaian Tor, tukar tetapan ini.">
-<!ENTITY torSettings.enterFirewall "Masukkan senarai port yang dipisahkan melalui koma yang dibenarkan oleh firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties
index 8bcd08e..c403773 100644
--- a/src/chrome/locale/ms-MY/torlauncher.properties
+++ b/src/chrome/locale/ms-MY/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Pelancar Tor
 
-torlauncher.tor_exited=Tor telah terkeluar secara tidak sengaja.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Menyambung
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Henti
 torlauncher.quit_win=Keluar
 torlauncher.done=Selesai
 
 torlauncher.forAssistance=Untuk bantuan, hubungi %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/mt/network-settings.dtd
+++ b/src/chrome/locale/mt/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/mt/torlauncher.properties
+++ b/src/chrome/locale/mt/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd
index 2f2890b..19ac674 100644
--- a/src/chrome/locale/my/network-settings.dtd
+++ b/src/chrome/locale/my/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "á??á??á?ºá??á??á?¶á?·á?«">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties
index 628cd89..9c1d74c 100644
--- a/src/chrome/locale/my/torlauncher.properties
+++ b/src/chrome/locale/my/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=á??á?½á??á?ºá??á??á?º
 torlauncher.quit_win=á??á?½á??á?ºá??á??á?º
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Relay á??á?á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?ºá??á?¯á??á?á?¯ á??á??á?ºá??á?½á??á?ºá??á?±á??á??á?º
 torlauncher.bootstrapStatus.handshake_dir=á??á?¬á??á?¾á??á?ºá??á?¬á?¸á??á??á?ºá?· á??á?á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á?»á?á??á?ºá??á??á?ºá??á?¾á?¯ á??á??á?ºá??á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?º
 torlauncher.bootstrapStatus.requesting_status=á??á?½á??á?ºá??á??á?º á?¡á??á?±á?¡á??á?¬á?¸á??á?á?¯ á??á?¼á??á?ºá??á??á?°á??á?±á??á??á?º
diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/nah/network-settings.dtd
+++ b/src/chrome/locale/nah/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/nah/torlauncher.properties
+++ b/src/chrome/locale/nah/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/nap/network-settings.dtd
+++ b/src/chrome/locale/nap/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/nap/torlauncher.properties
+++ b/src/chrome/locale/nap/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd
index fb5bd9b..7c02244 100644
--- a/src/chrome/locale/nb/network-settings.dtd
+++ b/src/chrome/locale/nb/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nei">
 
 <!ENTITY torSettings.firstQuestion "Hvilket av fÃ¸lgende beskriver best din situasjon?">
-<!ENTITY torSettings.configurePrompt1 "Denne datamaskinens Internett-tilkobling er sensurert, filtrert, eller gÃ¥r gjennom en proxy.">
-<!ENTITY torSettings.configurePrompt2 "Jeg mÃ¥ konfigurere bro, brannmur eller proxy innstillinger.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Konfigurer">
 <!ENTITY torSettings.connectPrompt2 "Jeg vil koble direkte til Tor-nettverket.">
 <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Hvis du ikke er sikker pÃ¥ hvordan du skal svare pÃ¥ dette spÃ¸rsmÃ¥let, se pÃ¥ Internett-innstillingene i en annen nettleser for Ã¥ se om den er konfigurert til Ã¥ bruke en proxy.">
 <!ENTITY torSettings.enterProxy "Skriv inn proxy-innstillingene.">
-<!ENTITY torSettings.firewallQuestion "GÃ¥r denne datamaskinens Internett-tilkobling gjennom en brannmur som kun tillater forbindelser til visse porter?">
-<!ENTITY torSettings.firewallHelp "Hvis du ikke er sikker pÃ¥ hvordan du skal svare pÃ¥ dette spÃ¸rsmÃ¥let, velg nei. Hvis du stÃ¸ter pÃ¥ problemer med Ã¥ koble til Tor-nettverket, endrer du denne innstillingen.">
-<!ENTITY torSettings.enterFirewall "Skriv inn en liste, adskilt med komma, over porter som er tillatt av brannmuren.">
 <!ENTITY torSettings.bridgeQuestion "Blokkerer eller sensurerer internettleverandÃ¸ren (ISP) din tilkoblinger til Tor-nettverket?">
 <!ENTITY torSettings.bridgeHelp "Hvis du er usikker pÃ¥ hva du skal svare pÃ¥ dette spÃ¸rsmÃ¥let, velg Nei.&#160; Hvis du velger Ja, vil du bli bedt om Ã¥ konfigurere Tor-broer, som er ulistede relÃ©er som gjÃ¸r det vanskeligere Ã¥ blokkere tilkoblinger til Tor-nettverket.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruke de angitte broene eller du kan skaffe og oppgi egendefinerte broer.">
@@ -59,8 +56,8 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Via nettet">
 <!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for Ã¥ besÃ¸ke https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">
-<!ENTITY torsettings.bridgeHelp3 "Send e-post til bridges@xxxxxxxxxxxxxx med tekstlinjen 'get bridges' som eneste innhold i e-posten.&#160; 
-Men, for Ã¥ gjÃ¸re det vanskeligere for en angriper Ã¥ lÃ¦re seg en masse bro-adresser, mÃ¥ du sende denne forespÃ¸rselen fra en gmail.com eller yahoo.com adresse.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send en e-post til bridges@xxxxxxxxxxxxxx med 'get bridges' enten i emnefeltet eller i meldingen.&#160; For Ã¥ gjÃ¸re det vanskeligere for en angriper Ã¥ ta rede pÃ¥ en mengde bro-adresser, mÃ¥ du sende denne forespÃ¸rselen fra en av fÃ¸lgende i listen over e-posttilbydere (opplistet etter preferanse):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eller https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Via supporten">
 <!ENTITY torsettings.bridgeHelp4 "Som en siste utvei, kan du be om bro-adresser ved Ã¥ sende en hÃ¸flig e-post til help@xxxxxxxxxxxxxxxxxx&#160; 
 Tenk over at en person mÃ¥ svare pÃ¥ hver slik forespÃ¸rsel.">
diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties
index dfcd138..b440fc4 100644
--- a/src/chrome/locale/nb/torlauncher.properties
+++ b/src/chrome/locale/nb/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor ble uventet avsluttet.
-torlauncher.tor_connection_lost=Din forbindelse til Tor-nettverket har blitt brutt.
+torlauncher.tor_exited=Tor avsluttet uventet. Dette kan vÃ¦re forÃ¥rsaket av en feil i Tor, eller et annet program pÃ¥ ditt system, alternativt Ã¸delagt maskinvare. FÃ¸r omstart av Tor er gjennomfÃ¸rt vil du ikke kunne nÃ¥ noen nettsider. Hvis problemet vedvarer, send en kopi av din Tor-logg til brukerstÃ¸tte.
+torlauncher.tor_exited2=Omstart av Tor vil ikke lukke fanene dine.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkobling
 torlauncher.recommended_bridge=(anbefalt)
 
 torlauncher.connect=Koble til
-torlauncher.reconnect=Koble til pÃ¥ nytt
+torlauncher.restart_tor=Omstart av Tor
 torlauncher.quit=Avslutt
 torlauncher.quit_win=Exit
 torlauncher.done=Ferdig
 
 torlauncher.forAssistance=For hjelp, kontakt %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Kobler til en relÃ©katalog 
 torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse
 torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus
diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/nds/network-settings.dtd
+++ b/src/chrome/locale/nds/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/nds/torlauncher.properties
+++ b/src/chrome/locale/nds/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd
index 91c9614..800a3b5 100644
--- a/src/chrome/locale/ne/network-settings.dtd
+++ b/src/chrome/locale/ne/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties
index 6963aa2..ddd7834 100644
--- a/src/chrome/locale/ne/torlauncher.properties
+++ b/src/chrome/locale/ne/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=à¤?à¥?à¤° à¤¸à¥?à¤°à¥?à¤µà¤¾à¤¤à¤?à¤°à¥?à¤¤à¤¾
 
-torlauncher.tor_exited=à¤?à¥?à¤° à¤?à¤¨à¤ªà¥?à¤?à¥?à¤·à¤¿à¤¤ à¤°à¥?à¤ªà¤®à¤¾ à¤¬à¤¨à¥?à¤¦ à¤à¤¯à¥?|
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=à¤?à¥?à¤°à¤?à¥? à¤¨à¤¿à¤¯à¥?à¤?à¤¤à¥?à¤°à¤£ à¤ªà¥?à¤°à¥?à¤?à¤¸à¤?à¤? à¤?à¤¡à¤¾à¤¨ à¤µà¤¿à¤«à¤² à¤à¤¯à¥?|
 torlauncher.tor_failed_to_start=à¤?à¥?à¤° à¤?à¥?à¤²à¥?à¤¨ à¤µà¤¿à¤«à¤² à¤à¤¯à¥? |
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=à¤?à¤¡à¤¾à¤¨ à¤?à¤°à¥?à¤¨à¥?à¤¹à¥?à¤¸à¥? 
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=à¤¬à¤¨à¥?à¤¦ à¤?à¤°à¥?à¤¨à¥?à¤¹à¥?à¤¸
 torlauncher.quit_win=à¤¬à¤¨à¥?à¤¦
 torlauncher.done=à¤à¤¯à¥?
 
 torlauncher.forAssistance=à¤?à¤¾à¤¨à¤?à¤¾à¤°à¥?à¤?à¥? à¤²à¤¾à¤?à¤¿ à¤¸à¤®à¥?à¤ªà¤°à¥?à¤? à¤?à¤°à¥?à¤¨à¥?à¤¹à¥?à¤¸
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/nl-BE/network-settings.dtd
+++ b/src/chrome/locale/nl-BE/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/nl-BE/torlauncher.properties
+++ b/src/chrome/locale/nl-BE/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index 5b26fc2..8f37c53 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nee">
 
 <!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?">
-<!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer wordt gecensureerd, gefilterd of geproxyed.">
-<!ENTITY torSettings.configurePrompt2 "Ik moet bridge, firewall, of proxy instellingen wijzigen.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configureer">
 <!ENTITY torSettings.connectPrompt2 "Ik zou graag rechtstreeks met het Tor netwerk verbinden.">
 <!ENTITY torSettings.connectPrompt3 "Dit zal in de meeste omstandigheden werken">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Als je niet zeker bent over het antwoord op deze vraag, bekijk dan de verbindingsinstellingen van een andere browser om te zien of die is ingesteld om gebruik te maken van een proxy.">
 <!ENTITY torSettings.enterProxy "Voer de proxy-instellingen in.">
-<!ENTITY torSettings.firewallQuestion "Loopt de internetverbinding van deze computer door een firewall die enkel toegang tot bepaalde poorten toestaat?">
-<!ENTITY torSettings.firewallHelp "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee. Als je op problemen botst tijdens het verbinden met het Tor netwerk, verander dan deze instelling.">
-<!ENTITY torSettings.enterFirewall "Voer de poorten in die toegestaan zijn door de firewall, gescheiden door komma's.">
 <!ENTITY torSettings.bridgeQuestion "Doet je Internet Service Provider (ISP) het Tor netwerk verbieden of filteren?">
 <!ENTITY torSettings.bridgeHelp "Als je niet zeker weet hoe je deze vraag moet beantwoorden, kies dan Nee.&#160; Als je Ja kiest, moet je Tor bridges instellen, die doordat ze geen bekende relays zijn het dus moeilijker maken om verbinding te maken met het Tor Netwerk. ">
 <!ENTITY torSettings.bridgeSettingsPrompt "Je kunt de ingegeven bridges gebruiken, of je kunt een eigen bridge instellen. ">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Door middel van het Web">
 <!ENTITY torsettings.bridgeHelp2 "Gebruik een browser om https://bridges.torproject.org te bezoeken">
 <!ENTITY torsettings.bridgeHelp3Heading "Door middel van de E-mail Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Zend een e-mail naar bridges@xxxxxxxxxxxxxx met als inhoud van de mail de tekst 'get bridges'.&#160; Let wel, om het aanvallers te bemoeilijken informatie te krijgen over bridge adressen, dient u uw aanvraag te versturen van een gmail.com of yahoo.com e-mailadres.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Zend een e-mail naar bridges@xxxxxxxxxxxxxx met als inhoud van de mail de tekst 'get bridges'.&#160; Let wel, om het aanvallers te bemoeilijken informatie te verkrijgen over bridge adressen, dient u uw aanvraag te versturen van een gmail.com of yahoo.com e-mailadres( gerangschikt in voorkeurs volgorde).">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Door middel van de helpdesk">
 <!ENTITY torsettings.bridgeHelp4 "Als laatste redmiddel, kan u bridge adressen aanvraag door een zeer vriendelijke e-mail te sturen naar help@xxxxxxxxxxxxxxxxxx&#160; Houd er wel rekening mee dat deze persoon elke aanvraag moet behandelen.">
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index 182ae3c..5fee2c2 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Starter
 
-torlauncher.tor_exited=Tor is onverwacht afgesloten.
-torlauncher.tor_connection_lost=Je verbinding met het Tor netwerk is verbroken.
+torlauncher.tor_exited=Tor is onverwachts afgesloten. Dit kan veroorzaakt zijn door een fout in Tor zelf, een ander op je systeem geÃ¯nstalleerd programma of door slecht functionerende hardware. Totdat je tor opnieuw hebt opgestart zal de Tor Browser niet in staat zijn een website te bereiken. Stuur een kopie van je Tor Log naar het support team als het probleem zich voor blijft doen.
+torlauncher.tor_exited2=Tor herstarten zal niet uw browser tabbladen sluiten.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=GÃ©Ã©n van de verstrekte bridges met h
 torlauncher.recommended_bridge=(aanbevolen)
 
 torlauncher.connect=Verbind
-torlauncher.reconnect=Opnieuw verbinden
+torlauncher.restart_tor=Herstart Tor
 torlauncher.quit=Stop
 torlauncher.quit_win=Sluit af
 torlauncher.done=OK
 
 torlauncher.forAssistance=Voor hulp, contacteer %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Verbinden met een relay directory
 torlauncher.bootstrapStatus.handshake_dir=Maken van een versleutelde verbinding met de lijst
 torlauncher.bootstrapStatus.requesting_status=Ontvangen van de netwerkstatus
diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd
index a675de3..217e82e 100644
--- a/src/chrome/locale/nn/network-settings.dtd
+++ b/src/chrome/locale/nn/network-settings.dtd
@@ -1,27 +1,24 @@
-<!ENTITY torsettings.dialog.title "Tor Network Settings">
+<!ENTITY torsettings.dialog.title "Tor nettverksinnstillingar">
 
 <!-- For "first run" wizard: -->
 
 <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection.">
 
-<!ENTITY torSettings.yes "Yes">
+<!ENTITY torSettings.yes "Ja">
 <!ENTITY torSettings.no "Nei">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
-<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
+<!ENTITY torSettings.connectPrompt2 "Eg vil kopla til direkte til Tor-nettverket.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
-<!ENTITY torSettings.connect "Connect">
+<!ENTITY torSettings.connect "Kopla til">
 
 <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
-<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
+<!ENTITY torSettings.enterProxy "Skriv inn mellomtenarinnstillingane.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -29,25 +26,25 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Waiting for Tor to startâ?¦">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Start Tor pÃ¥ nytt">
 
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "Valfritt">
 
 <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.address "Address:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
+<!ENTITY torsettings.useProxy.type "Mellomtenartype:">
+<!ENTITY torsettings.useProxy.address "Addresse:">
+<!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller vertsnamn">
 <!ENTITY torsettings.useProxy.port "Port:">
-<!ENTITY torsettings.useProxy.username "Username:">
-<!ENTITY torsettings.useProxy.password "Password:">
+<!ENTITY torsettings.useProxy.username "Brukarnamn:">
+<!ENTITY torsettings.useProxy.password "Passord:">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
-<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
+<!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS">
 <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
+<!ENTITY torsettings.firewall.allowedPorts "Tillatne portar:">
 <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
 <!ENTITY torsettings.useBridges.default "Connect with provided bridges">
-<!ENTITY torsettings.useBridges.type "Transport type:">
+<!ENTITY torsettings.useBridges.type "Transporttype:">
 <!ENTITY torsettings.useBridges.custom "Enter custom bridges">
 <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
 <!ENTITY torsettings.useBridges.placeholder "type address:port">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties
index 5da2bb8..2a7698b 100644
--- a/src/chrome/locale/nn/torlauncher.properties
+++ b/src/chrome/locale/nn/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -13,7 +13,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
+torlauncher.torrc_missing=torrc-fila manglar
 torlauncher.datadir_missing=The Tor data directory does not exist.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
@@ -29,31 +29,33 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 
 torlauncher.recommended_bridge=(tilrÃ¥dd)
 
-torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
-torlauncher.quit=Quit
+torlauncher.connect=Kople til
+torlauncher.restart_tor=Start Tor pÃ¥ nytt
+torlauncher.quit=Avslutt
 torlauncher.quit_win=Avslutt
 torlauncher.done=Done
 
-torlauncher.forAssistance=For assistance, contact %S
+torlauncher.forAssistance=For hjelp, kontakt %S
+
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
 
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
-torlauncher.bootstrapStatus.loading_status=Loading network status
+torlauncher.bootstrapStatus.loading_status=Lastar nettverkstatus
 torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
 torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
 torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
 torlauncher.bootstrapStatus.conn_or=Koplar til Tor-nettverket
 torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
+torlauncher.bootstrapStatus.done=Kopla til Tor-nettverket!
 
 torlauncher.bootstrapWarning.done=done
-torlauncher.bootstrapWarning.connectrefused=connection refused
+torlauncher.bootstrapWarning.connectrefused=tilkopling avslÃ¥tt
 torlauncher.bootstrapWarning.misc=miscellaneous
 torlauncher.bootstrapWarning.resourcelimit=insufficient resources
 torlauncher.bootstrapWarning.identity=identity mismatch
 torlauncher.bootstrapWarning.timeout=connection timeout
 torlauncher.bootstrapWarning.noroute=no route to host
-torlauncher.bootstrapWarning.ioerror=read/write error
+torlauncher.bootstrapWarning.ioerror=lese/skrive-feil
 torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/nso/network-settings.dtd
+++ b/src/chrome/locale/nso/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/nso/torlauncher.properties
+++ b/src/chrome/locale/nso/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/oc/network-settings.dtd
+++ b/src/chrome/locale/oc/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/oc/torlauncher.properties
+++ b/src/chrome/locale/oc/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/or/network-settings.dtd
+++ b/src/chrome/locale/or/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/or/torlauncher.properties
+++ b/src/chrome/locale/or/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd
index b422fe9..3beefe6 100644
--- a/src/chrome/locale/pa/network-settings.dtd
+++ b/src/chrome/locale/pa/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "à¨¨à¨¹à©?à¨?">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "à¨®à©?à¨¨à©?à©° à¨¬à¨°à¨¿à©?, à¨«à¨¾à¨?à¨°à¨µà¨¾à¨² à¨?à¨¾à¨? à¨ªà¨°à¨¾à¨?à¨¸à©? à¨¸à©?à¨?à¨¿à©°à¨? à¨¦à©? à¨¸à©°à¨°à¨?à¨¨à¨¾ à¨?à¨°à¨¨ à¨¦à©? à¨²à©?à©? à¨¹à©?à¥¤">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "à¨¸à©°à¨°à¨?à¨¨à¨¾">
 <!ENTITY torSettings.connectPrompt2 "à¨®à©?à¨? à¨?à©?à¨° à¨¨à©?à©±à¨?à¨µà¨°à¨? à¨¨à¨¾à¨² à¨¸à¨¿à©±à¨§à¨¾ à¨?à©?à¨¨à©?à¨?à¨? à¨¹à©?à¨£à¨¾ à¨?à¨¾à¨¹à©?à©°à¨¦à¨¾/à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à¨¾à¨?à¥¤">
 <!ENTITY torSettings.connectPrompt3 "à¨?à¨¹ à¨¬à¨¹à©?à¨¤à©? à¨¹à¨¾à¨²à¨¤à¨¾à¨? à¨µà¨¿à©±à¨? à¨?à©°à¨® à¨?à¨°à©?à¨?à¨¾à¥¤">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "à¨µà©?à©±à¨¬ à¨°à¨¾à¨¹à©?à¨?">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "à¨®à©±à¨¦à¨¦ à¨¡à©?à¨¸à¨? à¨°à¨¾à¨¹à©?à¨?">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties
index 1183cb8..4246cf6 100644
--- a/src/chrome/locale/pa/torlauncher.properties
+++ b/src/chrome/locale/pa/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=à¨?à©?à¨° à¨²à¨¾à¨?à¨?à¨°
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=à¨?à©?à¨¨à©?à¨?à¨? à¨?à¨°à©?
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=à¨¬à©°à¨¦ à¨?à¨°à©?
 torlauncher.done=à¨®à©?à¨?à©°à¨®à¨²
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=à¨¨à©?à©±à¨?à¨µà¨°à¨? à¨¸à¨¥à¨¿à¨¤à©? à¨ªà©?à¨°à¨¾à¨ªà¨¤ à¨?à©?à¨¤à©? à¨?à¨¾ à¨°à¨¹à©? à¨¹à©?
diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/pap/network-settings.dtd
+++ b/src/chrome/locale/pap/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/pap/torlauncher.properties
+++ b/src/chrome/locale/pap/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index b3beb8a..9d794b4 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nie">
 
 <!ENTITY torSettings.firstQuestion "KtÃ³re z poniÅ¼szych najlepiej opisuje TwojÄ? sytuacjÄ??">
-<!ENTITY torSettings.configurePrompt1 "PoÅ?Ä?czenie tego komputera jest cenzurowane, filtrowane lub przekierowywane.">
-<!ENTITY torSettings.configurePrompt2 "MuszÄ? skonfigurowaÄ? most, firewall lub ustawienia serwera proxy.">
+<!ENTITY torSettings.configurePrompt1 "PoÅ?Ä?czenie internetowe tego komputera jest ocenzurowane lub przepuszczane przez proxy.">
+<!ENTITY torSettings.configurePrompt2 "MuszÄ? skonfigurowaÄ? most lub ustawienia serwera proxy.">
 <!ENTITY torSettings.configure "Konfiguruj">
 <!ENTITY torSettings.connectPrompt2 "ChcÄ? poÅ?Ä?czyÄ? siÄ? bezpoÅ?rednio z sieciÄ? Tor.">
 <!ENTITY torSettings.connectPrompt3 "To zadziaÅ?a w wiÄ?kszoÅ?ci sytuacji.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "JeÅ?li nie jesteÅ? pewny odpowiedzi sprawdÅº ustawienia internetowe innej przeglÄ?darki, czy jest skonfigurowana do uÅ¼ycia serwera proxy.">
 <!ENTITY torSettings.enterProxy "WprowadÅº ustawienia serwera proxy">
-<!ENTITY torSettings.firewallQuestion "Czy poÅ?Ä?czenie internetowe Twojego komputera pozwala przejÅ?Ä? przez zaporÄ? sieciowÄ? w celu nawiÄ?zania poÅ?Ä?czenia z ustalonymi portami?">
-<!ENTITY torSettings.firewallHelp "JeÅ?li nie jesteÅ? pewien jak odpowiedzieÄ? na to pytanie, wybierz Nie. W przypadku wystÄ?pienia problemÃ³w z poÅ?Ä?czeniem, zmieÅ? tÄ? opcjÄ?.">
-<!ENTITY torSettings.enterFirewall "WprowadÅº listÄ? portÃ³w dozwolonych przez zaporÄ? (kolejne porty oddzielaj przecinkiem).">
 <!ENTITY torSettings.bridgeQuestion "Czy TwÃ³j dostawca usÅ?ug internetowych (ISP) blokuje lub cenzuruje poÅ?Ä?czenia sieci Tor?">
 <!ENTITY torSettings.bridgeHelp "JeÅ?li nie jesteÅ? pewny odpowiedzi na to pytanie proszÄ? wybraÄ? odpowiedÅº Nie.&#160; JeÅ?li wybierzesz Tak, to bÄ?dziesz poproszony o skonfigurowanie mostkÃ³w Tora, ktÃ³re nie sÄ? publicznie wymienione, dziÄ?ki czemu bÄ?dzie trudniej zablokowaÄ? poÅ?Ä?czenia do sieci Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "MoÅ¼esz wybraÄ? dostÄ?pny zestaw mostkÃ³w, albo moÅ¼esz uzyskaÄ? i wprowadziÄ? niestandardowy zestaw mostÃ³w.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Za poÅ?rednictwem sieci Web">
 <!ENTITY torsettings.bridgeHelp2 "UÅ¼yj przeglÄ?darki internetowej do odwiedzenia https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "WyÅ?lij e-mail do bridges@xxxxxxxxxxxxxx z liniÄ? &quot;get bridges&quot; w treÅ?ci wiadomoÅ?ci.&#160; Aby jednak, utrudniÄ? napastnikom naukÄ? o adresach mostÃ³w, naleÅ¼y wysÅ?aÄ? proÅ?bÄ? z adresu email gmail.com lub yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "WyÅ?lij e-maila na adres bridges@xxxxxxxxxxxxxx piszÄ?c w treÅ?ci emaila 'get bridges'.&#160; Jednak, aby utrudniÄ? napastnikom naukÄ? o adresach bridges, naleÅ¼y wysÅ?aÄ? tego emaila uÅ¼ywajÄ?c jednego z wymienionych dostawcÃ³w usÅ?ugi email (dostawcy wymienieni sÄ? w kolejnoÅ?ci preferencji):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, lub https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Przez Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "W ostatecznoÅ?ci, moÅ¼na zaÅ¼Ä?daÄ? adresÃ³w mostÃ³w, wysyÅ?ajÄ?c uprzejmÄ? wiadomoÅ?Ä? e-mail do help@xxxxxxxxxxxxxxxxxx&#160;  NaleÅ¼y pamiÄ?taÄ?, Å¼e osoba bÄ?dzie musiaÅ?a odpowiedzieÄ? na kaÅ¼de Å¼Ä?danie.">
diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties
index 367c5be..e7746bb 100644
--- a/src/chrome/locale/pl/torlauncher.properties
+++ b/src/chrome/locale/pl/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor wyÅ?Ä?czyÅ? siÄ? niespodziewanie.
-torlauncher.tor_connection_lost=Twoje poÅ?Ä?czenie z sieciÄ? Tor zostaÅ?o utracone.
+torlauncher.tor_exited=Tor niespodziewanie wyÅ?Ä?czyÅ? siÄ?. MoÅ¼e to byÄ? spowodowane bÅ?Ä?dem programu Tor, lub innego programu zainstalowanym w Twoim systemie, lub moÅ¼e byÄ? to wina wadliwego sprzÄ?tu. Do czasu ponownego uruchomienia Tora, Tor Browser nie bÄ?dzie w stanie dotrzeÄ? do wszystkich stron. JeÅ?li problem nadal wystÄ?puje, naleÅ¼y wysÅ?aÄ? kopiÄ? logÃ³w Tora do zespoÅ?u pomocy technicznej.
+torlauncher.tor_exited2=Zrestartowanie Tora nie spowoduje zamkniÄ?cia Twoich zakÅ?adek.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Brak dostÄ?pnych mostkÃ³w, ktÃ³re maj
 torlauncher.recommended_bridge=(zalecane)
 
 torlauncher.connect=PoÅ?Ä?cz
-torlauncher.reconnect=PoÅ?Ä?cz ponownie
+torlauncher.restart_tor=Zrestartuj Tor
 torlauncher.quit=WyjÅ?cie
 torlauncher.quit_win=WyjÅ?cie
 torlauncher.done=Gotowe
 
 torlauncher.forAssistance=By uzyskaÄ? pomoc, skontaktuj siÄ?
 
+torlauncher.copiedNLogMessages=Kopia zakoÅ?czona. %S logi Tora sÄ? gotowe do wklejenia do notatnika lub wiadomoÅ?ci email.
+
 torlauncher.bootstrapStatus.conn_dir=PodÅ?Ä?czanie do katalogu wÄ?zÅ?Ã³w
 torlauncher.bootstrapStatus.handshake_dir=Ustanawianie szyfrowanego poÅ?Ä?czenia z katalogiem
 torlauncher.bootstrapStatus.requesting_status=Odczytywanie stanu sieci
diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/pms/network-settings.dtd
+++ b/src/chrome/locale/pms/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/pms/torlauncher.properties
+++ b/src/chrome/locale/pms/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ps/network-settings.dtd
+++ b/src/chrome/locale/ps/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ps/torlauncher.properties
+++ b/src/chrome/locale/ps/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd
index 254e1cc..b78b35c 100644
--- a/src/chrome/locale/pt-BR/network-settings.dtd
+++ b/src/chrome/locale/pt-BR/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "NÃ£o">
 
 <!ENTITY torSettings.firstQuestion "Quais opÃ§Ãµes descrevem melhor a sua situaÃ§Ã£o?">
-<!ENTITY torSettings.configurePrompt1 "A conexÃ£o Internet deste computador foi censurada, filtrada ou limitada por um proxy.">
-<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar o bridge, firewall ou opÃ§Ãµes de proxy.">
+<!ENTITY torSettings.configurePrompt1 "A conexÃ£o internet deste computador encontra-se sob censura ou proxy.">
+<!ENTITY torSettings.configurePrompt2 "Ã? preciso configurar bridge ou ">
 <!ENTITY torSettings.configure "Configurar">
 <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente Ã  rede Tor.">
 <!ENTITY torSettings.connectPrompt3 "Isso funcionarÃ¡ na maioria dos casos.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Caso vocÃª nÃ£o tenha certeza sobre como responder a essa questÃ£o, consulte as configuraÃ§Ãµes de rede em um outro browser para saber se ele estÃ¡ configurado para usar um proxy.">
 <!ENTITY torSettings.enterProxy "Insira as configuraÃ§Ãµes de proxy.">
-<!ENTITY torSettings.firewallQuestion "A conexÃ£o Internet deste computador Ã© filtrada por uma firewall que autoriza conexÃµes somente a certas portas?">
-<!ENTITY torSettings.firewallHelp "Se vocÃª nÃ£o tiver certeza sobre como responder a esta questÃ£o, escolha NÃ£o. Em caso de dificuldades de conexÃ£o Ã  rede Tor, modifique esta configuraÃ§Ã£o.">
-<!ENTITY torSettings.enterFirewall "Insira, separando-as por vÃrgulas, uma lista de portas habilitadas pelo firewall. ">
 <!ENTITY torSettings.bridgeQuestion "Seu provedor de serviÃ§os de internet (ISP) bloqueia ou censura conexÃµes Ã  rede Tor?">
 <!ENTITY torSettings.bridgeHelp "Se vocÃª nÃ£o estiver seguro sobre como responder a essa questÃ£o, escolha NÃ£o&#160;. Se vocÃª escolher Sim, serÃ¡ preciso configurar pontes Tor, que sÃ£o retransmissores nÃ£o-listados que dificultam possÃveis bloqueios Ã  rede Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "VocÃª pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. ">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "AtravÃ©s da Web">
 <!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "AtravÃ©s do Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Envie um e-mail para bridges@xxxxxxxxxxxxxx com a mensagem 'get bridges'.&#160;. Contudo, para tornar mais difÃcil para um invasor descobrir uma grande quantidade de endereÃ§os de pontes, esse pedido deve ser enviado de uma conta gmail.com ou yahoo.com.">
-<!ENTITY torsettings.bridgeHelp4Heading "AtravÃ©s do ">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Envie um e-mail para bridges@xxxxxxxxxxxxxx com a mensagem 'get bridges'.&#160; Contudo, para tornar mais difÃcil para um invasor descobrir uma grande quantidade de endereÃ§os, vocÃª deve enviar esse pedido a partir de um dos seguintes provedores de e-mail (listados em ordem de preferÃªncia).">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
+<!ENTITY torsettings.bridgeHelp4Heading "Pelo serviÃ§o de assistÃªncia">
 <!ENTITY torsettings.bridgeHelp4 "Como Ãºltima opÃ§Ã£o, vocÃª pode solicitar endereÃ§os de pontes enviando uma mensagem de e-mail educada para help@xxxxxxxxxxxxxxxxxx&#160;. Note que uma pessoa terÃ¡ que responder a cada solicitaÃ§Ã£o">
diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties
index fd5a15f..0741ccb 100644
--- a/src/chrome/locale/pt-BR/torlauncher.properties
+++ b/src/chrome/locale/pt-BR/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Inicializador do Tor
 
-torlauncher.tor_exited=Tor fechou inesperadamente.
-torlauncher.tor_connection_lost=Sua conexÃ£o Ã  rede Tor foi interrompida.
+torlauncher.tor_exited=O Tor fechou inesperadamente. Isso pode ser devido a um bug no Tor em si, a um outro programa no seu sistema, ou a um problema com o equipamento. O navegador Tor nÃ£o poderÃ¡ acessar nenhum website atÃ© que vocÃª o reinicie. Se o problema persistir, por favor envie uma cÃ³pia do seu Tor Log para a equipe responsÃ¡vel pela assistÃªncia.
+torlauncher.tor_exited2=Ao reiniciar o Tor, as abas do seu navegador nÃ£o serÃ£o fechadas. 
 torlauncher.tor_controlconn_failed=NÃ£o foi possÃvel conectar-se Ã  porta de controle do Tor.
 torlauncher.tor_failed_to_start=Falha ao iniciar Tor.
 torlauncher.tor_control_failed=Falha ao receber controle do Tor.
@@ -30,20 +30,22 @@ torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que tÃªm o
 torlauncher.recommended_bridge=(recomendado)
 
 torlauncher.connect=Conectar
-torlauncher.reconnect=Reconectar
+torlauncher.restart_tor=Reiniciar o Tor
 torlauncher.quit=Encerrar
 torlauncher.quit_win=Sair
 torlauncher.done=Terminado
 
 torlauncher.forAssistance=Para assistÃªncia, contacte
 
+torlauncher.copiedNLogMessages=CÃ³pia concluÃda. As mensagens %S do Tor log estÃ£o prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail.
+
 torlauncher.bootstrapStatus.conn_dir=Conectando a um diretÃ³rio de retransmissores
 torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexÃ£o de diretÃ³rio criptografada
 torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede
 torlauncher.bootstrapStatus.loading_status=Carregando estado da rede
 torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade
 torlauncher.bootstrapStatus.requesting_descriptors=Requisitando informaÃ§Ãµes do retransmissor
-torlauncher.bootstrapStatus.loading_descriptors=Carregando informaÃ§Ãµes de servidor
+torlauncher.bootstrapStatus.loading_descriptors=Carregando informaÃ§Ãµes do retransmissor
 torlauncher.bootstrapStatus.conn_or=Conectando Ã  rede Tor
 torlauncher.bootstrapStatus.handshake_or=Estabelecendo um circuito Tor
 torlauncher.bootstrapStatus.done=Conectado Ã  rede Tor!
diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd
index 1f5566e..6a469ec 100644
--- a/src/chrome/locale/pt/network-settings.dtd
+++ b/src/chrome/locale/pt/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "NÃ£o">
 
 <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situaÃ§Ã£o?">
-<!ENTITY torSettings.configurePrompt1 "A ligaÃ§Ã£o Ã  Internet deste computador estÃ¡ a ser censurada, filtrada ou utilizada atravÃ©s de um proxy.">
-<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar o bridge, o firewall e as definiÃ§Ãµes do proxy.">
+<!ENTITY torSettings.configurePrompt1 "Esta ligaÃ§Ã£o Ã  Internet estÃ¡ censurada ou Ã© atravÃ©s de um proxy.">
+<!ENTITY torSettings.configurePrompt2 "Preciso de configurar a ponte ou as definiÃ§Ãµes de proxy.">
 <!ENTITY torSettings.configure "Configurar">
 <!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente Ã  rede Tor.">
 <!ENTITY torSettings.connectPrompt3 "Isto funciona na maior parte das situaÃ§Ãµes.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Se nÃ£o tem a certeza de como responder esta questÃ£o, olhe para as definiÃ§Ãµes de Internet noutro navegador para ver se estÃ¡ configurado para usar um proxy.">
 <!ENTITY torSettings.enterProxy "Introduza as definiÃ§Ãµes de proxy.">
-<!ENTITY torSettings.firewallQuestion "A ligaÃ§Ã£o Ã  Internet deste computador atravessa uma firewall que sÃ³ permite algumas ligaÃ§Ãµes a certos portos?">
-<!ENTITY torSettings.firewallHelp "Se nÃ£o tem a certeza de como responder esta questÃ£o, escolha NÃ£o. Se encontrar quaisquer problemas ao ligar-se Ã  rede Tor, mude esta definiÃ§Ã£o.">
-<!ENTITY torSettings.enterFirewall "Introduza uma lista de portos separada por vÃrgulas que sÃ£o permitidas pela firewall.">
 <!ENTITY torSettings.bridgeQuestion "O seu fornecedor de serviÃ§os de internet bloqueia ou censura ligaÃ§Ãµes Ã  rede Tor ?">
 <!ENTITY torSettings.bridgeHelp "Se nÃ£o tem a certeza de como responder a esta questÃ£o, escolha o NÂº.&#160; Se escolher Sim, vai-lhe ser pedido para configurar as Tor Bridges, que sÃ£o pontos de passagem nÃ£o listados mais difÃceis de bloquear ligaÃ§Ãµes Ã  rede Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Pode usar o conjunto de bridges prÃ©-configurado fornecido, ou pode obter um conjunto de bridges personalizadas.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Pela rede">
 <!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Pelo respondedor de email automÃ¡tico">
-<!ENTITY torsettings.bridgeHelp3 "Envie um email para bridges@xxxxxxxxxxxxxx com a linha 'get bridges' no prÃ³prio corpo da mensagem.&#160; No entanto, para tornar mais difÃcil para um atacante apreender o conjunto de endereÃ§os de bridge, tem que enviar este pedido de uma conta gmail.com ou yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Enviar mensagem para bridges@xxxxxxxxxxxxxx com a linha 'get bridges' sozinha no corpo da mensagem.&#160; Contudo, para tornar mais difÃcil para os atacantes aprenderem sobre os endereÃ§os de pontes, tem de enviar a mensagem de um dos seguintes fornecedores de serviÃ§os de correio eletrÃ³nico (por esta ordem de preferÃªncia):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Pelo Helpdesk">
 <!ENTITY torsettings.bridgeHelp4 "Em Ãºltimo caso, pode pedir endereÃ§os bridge enviando um email cordial para help@xxxxxxxxxxxxxxxxxx&#160; Por favor tenha em conta que cada pedido serÃ¡ respondido por uma pessoa.">
diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties
index 94a233f..78b4729 100644
--- a/src/chrome/locale/pt/torlauncher.properties
+++ b/src/chrome/locale/pt/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Iniciador Tor
 
-torlauncher.tor_exited=O Tor fechou-se insperadamente.
-torlauncher.tor_connection_lost=A sua ligaÃ§Ã£o Ã  rede Tor perdeu-se.
+torlauncher.tor_exited=O tor encerrou inesperadamente. Pode ser devido a erro dentro o Tor, noutro programa no seu sistema ou falha no equipamento. AtÃ© reiniciar, o Tor nÃ£o serÃ¡ capaz de aceder a nenhum website. Se o problema persistir, por favor envie uma cÃ³pia do diÃ¡rio do seu Tor Ã  equipa de assistÃªncia.
+torlauncher.tor_exited2=Reiniciar o Tor nÃ£o fecha os seus separadores.
 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
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=NÃ£o hÃ¡ pontes disponÃveis que tenha
 torlauncher.recommended_bridge=(recomendado)
 
 torlauncher.connect=Ligar
-torlauncher.reconnect=Voltar a ligar
+torlauncher.restart_tor=Reiniciar o Tor
 torlauncher.quit=Sair
 torlauncher.quit_win=Sair
 torlauncher.done=Completo
 
 torlauncher.forAssistance=Para assistÃªncia, contacte %S
 
+torlauncher.copiedNLogMessages=CÃ³pia completa. %S mensagens de diÃ¡rio estÃ£o prontas para ser coladas num editor de texto ou numa mensagem de correio eletrÃ³nico.
+
 torlauncher.bootstrapStatus.conn_dir=A ligar ao diretÃ³rio do retransmissor
 torlauncher.bootstrapStatus.handshake_dir=A estabelecer uma ligaÃ§Ã£o de diretÃ³rio encriptada
 torlauncher.bootstrapStatus.requesting_status=A obter o estado da rede
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index b2c90ff..cc07448 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nu">
 
 <!ENTITY torSettings.firstQuestion "Care din urmÄ?toarele descrie cel mai bine situaÈ?ia dvs?">
-<!ENTITY torSettings.configurePrompt1 "Conexiunea acestui computer la Internet este cenzuratÄ?, filtratÄ? sau cu proxy.">
-<!ENTITY torSettings.configurePrompt2 "Trebuie sÄ? configurez punte, firewall sau proxy.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "ConfiguraÅ£i ">
 <!ENTITY torSettings.connectPrompt2 "Vreau sa ma conectez direct la reÅ£eaua Tor .">
 <!ENTITY torSettings.connectPrompt3 "Aceasta funcÈ?ioneazÄ? Ã®n cele mai multe situaÈ?ii.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "DacÄ? nu sÃ®nteÈ?i siguri cum sÄ? rÄ?spundeÈ?i la Ã®ntrebarea aceasta, uitaÈ?i-vÄ? la setÄ?rile de Internet din alt browser pentru a vedea dacÄ? este configurat sÄ? foloseascÄ? un proxy.">
 <!ENTITY torSettings.enterProxy "IntroduceÅ£i setÄ?rile pentru proxy .">
-<!ENTITY torSettings.firewallQuestion "Conexiunea la Internet a acestui computer iese printr-un firewall care permite doar conexiuni cÄ?tre anumite porturi?">
-<!ENTITY torSettings.firewallHelp "DacÄ? nu sÃ®nteÈ?i sigur cum sÄ? rÄ?spundeÈ?i la aceastÄ? Ã®ntrebare, alegeÈ?i Nu. DacÄ? Ã®ntÃ®lniÈ?i probleme conectÃ®ndu-vÄ? la reÈ?eaua Tor, schimbaÈ?i aceste setÄ?ri.">
-<!ENTITY torSettings.enterFirewall "IntroduceÈ?i o listÄ? separatÄ? cu virgule de porturi care sÃ®nt permise de firewall.">
 <!ENTITY torSettings.bridgeQuestion "Internet Service Providerul (ISP) dvs blocheazÄ? sau cenzureazÄ? conexiunile cÄ?tre reÈ?eaua Tor?">
 <!ENTITY torSettings.bridgeHelp "DacÄ? nu sÃ®nteÈ?i sigur cum sÄ? rÄ?spundeÈ?i la aceastÄ? Ã®ntrebare, alegeÈ?i Nu.&#160; DacÄ? alegeÈ?i Da, vi se va cere sÄ? configuraÈ?i punÈ?ile Tor, care sÃ®nt relayuri nelistate care fac mai dificilÄ? blocarea conexiunilor la reÈ?eaua Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "PuteÈ?i folosi setul de punÈ?i oferit sau puteÈ?i obÈ?ine È?i introduce un set particular de punÈ?i.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Prin Web">
 <!ENTITY torsettings.bridgeHelp2 "FolosiÈ?i un webbrowser pentru a vizita https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Prin email automat">
-<!ENTITY torsettings.bridgeHelp3 "TrimiteÈ?i email la bridges@xxxxxxxxxxxxxx cu 'get bridges' singurÄ? Ã®n corpul mesajului.&#160; Oricum, pentru a face mai greu pentru un atacator sÄ? afle multe adrese de punÈ?i, trebuie sÄ? trimiteÈ?i aceastÄ? cerere de la o adresÄ? gmail.com sau yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Ca o ultimÄ? soluÈ?ie, puteÈ?i cere adrese de punÈ?i trimiÈ?Ã®nd un email politicos la help@xxxxxxxxxxxxxxxxxx&#160; RemarcaÈ?i cÄ? o persoanÄ? trebuie sÄ? rÄ?spundÄ? la fiecare cerere.">
diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties
index adec424..cd61ca6 100644
--- a/src/chrome/locale/ro/torlauncher.properties
+++ b/src/chrome/locale/ro/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Lansator Tor
 
-torlauncher.tor_exited=Tor a ieÈ?it Ã®n mod neaÈ?teptat.
-torlauncher.tor_connection_lost=Conexiunea to cu reÈ?eaua Tor s-a pierdut.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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=EÈ?ec sÄ? preiau controlul Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Nici una din punÈ?ile oferite care sÄ?
 torlauncher.recommended_bridge=(recomandat)
 
 torlauncher.connect=Conectare
-torlauncher.reconnect=ReconecteazÄ?
+torlauncher.restart_tor=ReporneÈ?te Tor
 torlauncher.quit=Revocare
 torlauncher.quit_win=IeÅ?ire
 torlauncher.done=Gata
 
 torlauncher.forAssistance=Pentru asistenÈ?Ä?, contactaÈ?i
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Conectare la un director relay
 torlauncher.bootstrapStatus.handshake_dir=Se stabileÅ?te o conexiune criptatÄ? la director
 torlauncher.bootstrapStatus.requesting_status=Se obÅ£in informaÅ£ii despre starea reÅ£elei
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index 3cf9cd2..90857ae 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ð?ÐµÑ?">
 
 <!ENTITY torSettings.firstQuestion "Ð§Ñ?Ð¾ Ð»Ñ?Ñ?Ñ?Ðµ Ð¾Ð¿Ð¸Ñ?Ñ?Ð²Ð°ÐµÑ? Ð²Ð°Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ñ??">
-<!ENTITY torSettings.configurePrompt1 "Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ?Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ñ?Ñ?, Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ñ? Ð¸Ð»Ð¸ Ð½Ð°Ñ?Ð¾Ð´Ñ?Ñ?Ñ?Ñ? Ð·Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
-<!ENTITY torSettings.configurePrompt2 "Ð?Ð½Ðµ Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?, Ð±Ñ?Ð°Ð½Ð´Ð¼Ð°Ñ?Ñ?Ñ? Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ?">
 <!ENTITY torSettings.connectPrompt2 "Ð¯ Ð±Ñ? Ñ?Ð¾Ñ?ÐµÐ» Ñ?Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ñ?ÐµÑ?Ñ?Ñ? Tor Ð½Ð°Ð¿Ñ?Ñ?Ð¼Ñ?Ñ?.">
 <!ENTITY torSettings.connectPrompt3 "ÐÑ?Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð² Ð±Ð¾Ð»Ñ?Ñ?Ð¸Ð½Ñ?Ñ?Ð²Ðµ Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ð¹.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ð·Ð½Ð°ÐµÑ?Ðµ ÐºÐ°Ðº Ð¾Ñ?Ð²ÐµÑ?Ð°Ñ?Ñ?, Ð¿Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð² Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð´Ñ?Ñ?Ð³Ð¾Ð³Ð¾ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° - Ð¿Ñ?Ð¾Ð¿Ð¸Ñ?Ð°Ð½ Ð»Ð¸ Ñ?Ð°Ð¼ Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
 <!ENTITY torSettings.enterProxy "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸.">
-<!ENTITY torSettings.firewallQuestion "Ð?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾ Ð»Ð¸ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð±Ñ?Ð°Ð½Ð´Ð¼Ð°Ñ?Ñ?Ñ?Ð¾Ð¼, Ñ?Ð°Ð·Ñ?ÐµÑ?Ð°Ñ?Ñ?Ð¸Ð¼ Ñ?Ð²Ñ?Ð·Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ?ÐµÑ?ÐµÐ· Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ñ??">
-<!ENTITY torSettings.firewallHelp "Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ñ?Ð²ÐµÑ?ÐµÐ½Ñ? ÐºÐ°Ðº Ð¾Ñ?Ð²ÐµÑ?Ð°Ñ?Ñ?, Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð½ÐµÑ?. Ð?Ñ?Ð»Ð¸ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½Ñ?Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ? Ñ? Ñ?ÐµÑ?Ñ?Ñ? Tor, Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÑ?.">
-<!ENTITY torSettings.enterFirewall "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¿Ð¾Ñ?Ñ?Ð¾Ð² Ñ?ÐµÑ?ÐµÐ· Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ñ?, ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð±Ñ?Ð°Ð½Ð´Ð¼Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ñ?ÐµÑ?.">
 <!ENTITY torSettings.bridgeQuestion "Ð?Ð°Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ñ?ÐµÑ? Ð¸Ð»Ð¸ ÐºÐ°Ðº-Ð»Ð¸Ð±Ð¾ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ñ?ÐµÑ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸ Tor?">
 <!ENTITY torSettings.bridgeHelp "Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ð·Ð½Ð°ÐµÑ?Ðµ, ÐºÐ°Ðº Ð¾Ñ?Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ð¾Ñ? Ð²Ð¾Ð¿Ñ?Ð¾Ñ?, Ð²Ñ?Ð±Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð?ÐµÑ?.&#160; Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð²Ñ?Ð±ÐµÑ?ÐµÑ?Ðµ Ð?Ð°, Ð²Ð°Ñ? Ð¿Ð¾Ð¿Ñ?Ð¾Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ? Tor, ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð¿Ñ?Ð±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð½Ñ?Ð¼Ð¸ Ð¼Ð°Ñ?Ñ?Ñ?Ñ?Ñ?Ð¸Ð·Ð°Ñ?Ð¾Ñ?Ð°Ð¼Ð¸, Ñ?Ñ?Ð¾ Ð·Ð°Ñ?Ñ?Ñ?Ð´Ð½Ñ?ÐµÑ? Ð¸Ñ? Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²ÐºÑ?.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Ð?Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ñ?ÐµÐ´Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ?Ð¹ Ð½Ð°Ð±Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð¸Ð»Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸ Ð²Ð²ÐµÑ?Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð²Ñ?Ñ?Ñ?Ð½Ñ?Ñ?.">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ð?Ð¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ° Tor...">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tor">
 
 <!ENTITY torsettings.optional "Ð?ÐµÐ¾Ð±Ñ?Ð·Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Ð?Ð· Ð?ÐµÐ±">
 <!ENTITY torsettings.bridgeHelp2 "Ð?Ñ?ÐºÑ?Ð¾Ð¹Ñ?Ðµ Ð² Ð²ÐµÐ±-Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ðµ https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Ð§ÐµÑ?ÐµÐ· Ð°Ð²Ñ?Ð¾Ð¾Ñ?Ð²ÐµÑ?Ñ?Ð¸Ðº Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?Ñ?">
-<!ENTITY torsettings.bridgeHelp3 "Ð?Ñ?Ð¿Ñ?Ð°Ð²Ñ?Ñ?Ðµ Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾ Ð¿Ð¾ Ð°Ð´Ñ?ÐµÑ?Ñ? bridges@xxxxxxxxxxxxxx Ñ?Ð¾ Ñ?Ñ?Ñ?Ð¾ÐºÐ¾Ð¹ 'get bridges' Ð² Ñ?ÐµÐ»Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?.&#160; Ð?Ð´Ð½Ð°ÐºÐ¾ Ñ?Ñ?Ð¾Ð±Ñ? Ñ?Ñ?Ð»Ð¾Ð¶Ð½Ð¸Ñ?Ñ? Ñ?Ð±Ð¾Ñ? Ð°Ñ?Ð°ÐºÑ?Ñ?Ñ?Ð¸Ð¼Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ð²Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð², Ð¾Ñ? Ð?Ð°Ñ? Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° gmail.com Ð¸Ð»Ð¸ yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, Ð¸Ð»Ð¸ https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Ð? Ñ?Ð¿Ñ?Ð°Ð²Ð¾Ñ?Ð½Ð¾Ð¹ Ñ?Ð»Ñ?Ð¶Ð±Ðµ">
 <!ENTITY torsettings.bridgeHelp4 "Ð? ÐºÑ?Ð°Ð¹Ð½ÐµÐ¼ Ñ?Ð»Ñ?Ñ?Ð°Ðµ, Ð?Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð²ÐµÐ¶Ð»Ð¸Ð²Ð¾ Ð¿Ð¾Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð¿Ð¾ Ð°Ð´Ñ?ÐµÑ?Ñ? help@xxxxxxxxxxxxxxxxxx&#160; Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¸Ð¼ÐµÐ¹Ñ?Ðµ Ð² Ð²Ð¸Ð´Ñ?, Ñ?Ñ?Ð¾ ÐºÐ°Ð¶Ð´Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð¾Ð±Ñ?Ð°Ð±Ð°Ñ?Ñ?Ð²Ð°ÐµÑ?Ñ?Ñ? Ñ?ÐµÐ»Ð¾Ð²ÐµÐºÐ¾Ð¼.">
diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties
index ba61f55..20e6134 100644
--- a/src/chrome/locale/ru/torlauncher.properties
+++ b/src/chrome/locale/ru/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Ð?Ð°Ð³Ñ?Ñ?Ð·Ñ?Ð¸Ðº Tor
 
-torlauncher.tor_exited=Tor Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾ Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ð»Ñ?Ñ?.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼ Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ñ? Tor.
 torlauncher.tor_failed_to_start=Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tor.
 torlauncher.tor_control_failed=Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð²Ð·Ñ?Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ñ? Ð½Ð°Ð´ Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Ð?Ñ?ÐµÐ´Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ?Ðµ Ð¼Ð¾
 torlauncher.recommended_bridge=(Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÐ¼Ñ?Ð¹)
 
 torlauncher.connect=Ð¡Ð¾ÐµÐ´Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ñ?
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tor
 torlauncher.quit=Ð?Ñ?Ð¹Ñ?Ð¸
 torlauncher.quit_win=Ð?Ñ?Ñ?Ð¾Ð´
 torlauncher.done=Ð?Ð¾Ñ?Ð¾Ð²Ð¾
 
 torlauncher.forAssistance=Ð?Ð»Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ñ?Ð²Ñ?Ð¶Ð¸Ñ?ÐµÑ?Ñ? Ñ? %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³y Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð²
 torlauncher.bootstrapStatus.handshake_dir=Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ? ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³a
 torlauncher.bootstrapStatus.requesting_status=Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð° Ñ?ÐµÑ?Ð¸
diff --git a/src/chrome/locale/ru@petr1708/network-settings.dtd b/src/chrome/locale/ru@petr1708/network-settings.dtd
index bf31d5d..1e4c8b2 100644
--- a/src/chrome/locale/ru@petr1708/network-settings.dtd
+++ b/src/chrome/locale/ru@petr1708/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ð?ÐµÑ?">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ru@petr1708/torlauncher.properties b/src/chrome/locale/ru@petr1708/torlauncher.properties
index fb8d310..77dc4e7 100644
--- a/src/chrome/locale/ru@petr1708/torlauncher.properties
+++ b/src/chrome/locale/ru@petr1708/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÑ?Ñ?Ñ?)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/sco/network-settings.dtd
+++ b/src/chrome/locale/sco/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/sco/torlauncher.properties
+++ b/src/chrome/locale/sco/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd
index fbd30da..6312948 100644
--- a/src/chrome/locale/si-LK/network-settings.dtd
+++ b/src/chrome/locale/si-LK/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "à¶±à·?à¶">
 
 <!ENTITY torSettings.firstQuestion "à¶´à·?à¶ à·?à¶¯à·?à¶±à·? à¶?à·?à¶¸à¶?à·? à¶?à¶¶à¶?à·? à¶à¶à·?à¶à·?à·?à¶º à·?à·?à¶¯à·?à¶±à·?à¶¸ à·?à·?à·?à·?à¶à¶» à¶?à¶»à¶ºà·?à¶¯?">
-<!ENTITY torSettings.configurePrompt1 "à¶¸à·?à¶¸ à¶´à¶»à·?à¶?à¶«à¶?à¶ºà·? à¶?à¶±à·?à¶à¶»à·?à¶¢à·?à¶½ à·?à·?à¶?à·?à·?à¶¸ à·?à·?à¶»à¶«à¶ºà¶§ à¶½à¶?à·?à·?à·?, à¶´à·?à¶»à·?à¶¸à¶?à¶§ à¶½à¶?à·?à·?à·? à·?à·? à¶±à·?à¶ºà·?à¶à·? à·?à·?à·?à·? à¶¯à·?à¶ºà¶?à¶ºà·?à¶?à·?à¶§ à¶½à¶?à·?à·? à¶?à¶.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "à·?à·?à¶±à·?â??à¶ºà·?à·? à¶?à¶»à¶±à·?à¶±">
 <!ENTITY torSettings.connectPrompt2 "à¶¸à¶¸ à¶?à¶¢à·?à·?à¶¸ Tor à¶¢à·?à¶½à¶º à·?à·? à·?à¶¸à·?à¶¶à¶±à·?à¶°  à·?à·?à¶¸à¶§ à¶?à·?à¶¸à¶à·?à¶º.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "à¶?à¶¶à¶§ à¶¸à·?à¶¸ à¶´à·?â??à¶»à·?à·?à¶±à¶ºà¶§ à¶´à·?à·?à·?à¶à·?à¶»à·? à¶¯à·?à¶±à·?à¶±à·? à¶?à·?à·?à·?à¶¯ à¶ºà¶±à·?à¶± à·?à·?à·?à·?à·?à·?à·? à¶±à·?à¶à·?à¶±à¶¸à·?, à·?à·?à¶±à¶à·? browser à¶?à¶?à¶? à¶?à¶±à·?à¶à¶¢à·?à¶½ à·?à·?à¶?à·?à·?à¶¸à·? à¶±à·?à¶ºà·?à¶à·? à·?à·?à·?à·?à¶¯à·?à¶ºà¶?à¶ºà·?à¶?à·? à·?à¶¯à·?à·? à·?à·?à¶±à·?â??à¶ºà·?à·? à¶?à¶» à¶?à¶à·?à¶¯à·?à¶ºà·? à¶¶à¶½à¶±à·?à¶±">
 <!ENTITY torSettings.enterProxy "à¶±à·?à¶ºà·?à¶à·? à·?à·?à·?à·?à¶¯à·?à¶ºà¶? à·?à·?à¶?à·?à·?à¶¸à·? à¶?à¶à·?à·?à¶à·? à¶?à¶»à¶±à·?à¶±">
-<!ENTITY torSettings.firewallQuestion "à¶¸à·?à¶¸ à¶´à¶»à·?à¶?à¶«à¶?à¶ºà·? à¶?à¶±à·?à¶à¶»à·?à¶¢à·?à¶½ à·?à¶¶à·?à¶¯à·?à¶ºà·?à·? à·?à·?à·?à·?à·?à·?à¶ ports à·?à¶¯à·?à·? à¶?à¶©à¶¯à·?à¶± à¶´à¶»à·?à¶¯à·? firewall à¶?à¶?à¶?à·? à·?à¶»à·?à·? à¶?à¶¸à¶±à·? à¶?à¶»à¶±à·?à·?à¶¯?">
-<!ENTITY torSettings.firewallHelp "à¶?à¶¶à¶§ à¶¸à·?à¶¸ à¶´à·?â??à¶»à·?à·?à¶±à¶ºà¶§ à¶´à·?à·?à·?à¶à·?à¶»à·? à¶¯à·?à¶±à·?à¶±à·? à¶?à·?à·?à·?à¶¯ à¶ºà¶±à·?à¶± à·?à·?à·?à·?à·?à·?à·? à¶±à·?à¶à·?à¶±à¶¸à·?, à¶±à·?à¶ à¶ºà¶±à·?à¶± à¶à·?à¶»à¶±à·?à¶±. Tor à¶¢à·?à¶½à¶ºà¶§ à·?à¶¸à·?à¶¶à¶±à·?à¶° à·?à·?à¶¸à·?à¶¯à·? à¶?à¶¶à¶§ à¶?à·?à¶§à·?à·? à¶¸à¶à·?à·?à·? à¶±à¶¸à·? à¶¸à·?à¶¸ à·?à·?à¶?à·?à·?à¶¸ à·?à·?à¶±à·?à·? à¶?à¶»à¶±à·?à¶±">
-<!ENTITY torSettings.enterFirewall "firewall à¶?à¶? à·?à¶»à·?à·? à¶ºà·?à¶¸à¶§ à¶?à¶©à¶¯à·?à¶± ports à·?à¶½ à¶½à·?à¶ºà·?à·?à·?à¶à·?à·?à¶?à·? à¶?à·?à¶¸à·? à·?à¶½à·?à¶±à·? à·?à·?à¶±à·?à¶?à¶» à¶?à¶à·?à·?à¶à·? à¶?à¶»à¶±à·?à¶±.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties
index 9884689..a132cff 100644
--- a/src/chrome/locale/si-LK/torlauncher.properties
+++ b/src/chrome/locale/si-LK/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor à¶´à·?à¶»à¶±à¶º
 
-torlauncher.tor_exited=Tor à¶?à¶±à¶´à·?à¶?à·?à·?à·?à¶ à¶½à·?à·? à¶±à·?à¶à·?à·?à·?à¶º. 
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Tor à¶´à·?à¶½à¶? à¶´à·?à¶»à·?à¶§à¶ºà¶§ à·?à¶¸à·?à¶¶à¶±à·?à¶° à·?à·?à¶º à¶±à·?à·?à·?à¶?.
 torlauncher.tor_failed_to_start=Tor à¶?à¶»à¶¸à·?à¶· à¶?à·?à¶»à·?à¶¸à¶§ à¶?à¶´à·?à·?à·?à·?à¶à·?à¶º.
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=à·?à¶¸à·?à¶¶à¶±à·?à¶° à·?à·?à¶±à·?à¶±
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=à¶?à·?à¶à·? à·?à·?à¶±à·?à¶±
 torlauncher.quit_win=à¶?à¶ºà·?à¶±à·? à·?à¶±à·?à¶±
 torlauncher.done=à¶?à¶»à¶± à¶½à¶¯à·?
 
 torlauncher.forAssistance=à·?à·?à¶º à·?à¶¯à·?à·?, à·?à¶¸à·?à¶¶à¶±à·?à¶° à·?à¶±à·?à¶±%S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=à¶´à·?â??à¶»à¶à·?à¶ºà·?à¶¢à¶? à¶©à·?à¶»à·?à¶?à·?à¶§à¶»à·?à¶ºà¶?à¶§ à·?à¶¶à¶¯à·?à¶¸à·?à¶±à·?
 torlauncher.bootstrapStatus.handshake_dir=à·?à¶?à¶?à·?à¶ à¶?à¶»à¶± à¶½à¶¯ à¶©à·?à¶»à·?à¶?à·?à¶§à¶»à·? à·?à¶¶à·?à¶¯à·?à¶¸à¶?à·? à·?à·?à¶®à·?à¶´à¶±à¶º à¶?à¶»à¶¸à·?à¶±à·?
 torlauncher.bootstrapStatus.requesting_status=à¶¢à·?à¶½ à¶à¶à·?à·?à¶º à·?à¶¸à·?à¶°à·?à¶»à¶«à¶º à¶?à¶»à¶¸à·?à¶±à·?
diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd
index b5d9fe5..10ddb55 100644
--- a/src/chrome/locale/sk-SK/network-settings.dtd
+++ b/src/chrome/locale/sk-SK/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nie">
 
 <!ENTITY torSettings.firstQuestion "KtorÃ¡ z nasledujÃºcich situÃ¡ciÃ najlepÅ¡ie popisuje vaÅ¡u?">
-<!ENTITY torSettings.configurePrompt1 "Pripojenie tohto poÄ?ÃtaÄ?a je cenzurovanÃ©, filtrovanÃ© alebo vedenÃ© cez proxy.">
-<!ENTITY torSettings.configurePrompt2 "Potrebujem nastaviÅ¥ premostenie, firewall alebo proxy.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "KonfigurovaÅ¥">
 <!ENTITY torSettings.connectPrompt2 "RÃ¡d by som sa pripojil priamo do siete Tor.">
 <!ENTITY torSettings.connectPrompt3 "Toto by vo vÃ¤Ä?Å¡ine prÃpadov malo fungovaÅ¥.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ak si nie ste istÃ½ odpoveÄ?ou na tÃºto otÃ¡zku, skontrolujte nastavenia Internetu v inom prehliadaÄ?i, aby ste zistili, Ä?i je nastavenÃ½ pre pouÅ¾itie proxy.">
 <!ENTITY torSettings.enterProxy "Zadajte nastavenia proxy.">
-<!ENTITY torSettings.firewallQuestion "Je pripojenie tohto poÄ?ÃtaÄ?a na Internet vedenÃ© cez firewall, ktorÃ½ povoÄ¾uje spojenia len na urÄ?itÃ© porty?">
-<!ENTITY torSettings.firewallHelp "Ak neviete, ako mÃ¡te odpovedaÅ¥ na tÃºto otÃ¡zku, zvoÄ¾te Nie. Ak sa vyskytne problÃ©m s pripojenÃm do siete Tor, zmeÅ?te toto nastavenie.">
-<!ENTITY torSettings.enterFirewall "Zadajte Ä?Ãsla portov oddelenÃ© medzerou, ktorÃ© sÃº povolenÃ© na firewalle.">
 <!ENTITY torSettings.bridgeQuestion "Blokuje vÃ¡Å¡ poskytovateÄ¾ internetovÃ©ho pripojenia (ISP) alebo inak cenzuruje pripojenia do siete Tor Network?">
 <!ENTITY torSettings.bridgeHelp "Ak si nie ste istÃ, ako odpovedaÅ¥, zvoÄ¾te Nie.&#160; Ak zvolÃte Ã?no, bude potrebnÃ© nakonfigurovaÅ¥ Tor Bridges, Ä?o sÃº nikde nezapÃsanÃ© relÃ©, pouÅ¾itie ktorÃ½ch robÃ blokovanie pripojenia do Tor Network eÅ¡te obtiaÅ¾nejÅ¡Ãm.">
 <!ENTITY torSettings.bridgeSettingsPrompt "MÃ´Å¾ete pouÅ¾iÅ¥ dodanÃº sadu premostenÃ alebo si mÃ´Å¾ete zaobstaraÅ¥ a zadaÅ¥ vlastnÃº sadu premostenÃ.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "NavÅ¡tÃvte https://bridges.torproject.org pomocou webovÃ©ho prehliadaÄ?a">
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "OdoÅ¡lite e-mail na bridges@xxxxxxxxxxxxxx, ktorÃ½ v sprÃ¡ve na samostatnom riadku obsahuje 'get bridges'.&#160; Aby vÅ¡ak bolo zÃskanie adries premostenia pre ÃºtoÄ?nÃka Å¥aÅ¾Å¡ie, musÃte vaÅ¡u poÅ¾iadavku poslaÅ¥ z e-mailovej adresa na gmail.com alebo yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Ako poslednÃ© vÃ½chodisko, mÃ´Å¾ete poslaÅ¥ milÃ½ e-mail na help@xxxxxxxxxxxxxxxxx a poÅ¾iadaÅ¥ o adresy premostenia.&#160; Berte, prosÃm, na vedomie, Å¾e niekto bude musieÅ¥ na kaÅ¾dÃº poÅ¾iadavku samostatne reagovaÅ¥.">
diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties
index d588f70..076255c 100644
--- a/src/chrome/locale/sk-SK/torlauncher.properties
+++ b/src/chrome/locale/sk-SK/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor sa neÄ?akane vypol.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=PripojiÅ¥
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=ReÅ¡tartovaÅ¥ Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=UkonÄ?iÅ¥
 torlauncher.done=Hotovo
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd
index 500be4d..812f4f1 100644
--- a/src/chrome/locale/sk/network-settings.dtd
+++ b/src/chrome/locale/sk/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nie">
 
 <!ENTITY torSettings.firstQuestion "KtorÃ© z nasledujÃºcich moÅ¾nostÃ najlepÅ¡ie opisuje VaÅ¡u situÃ¡ciu?">
-<!ENTITY torSettings.configurePrompt1 "InternetovÃ© pripojenie tohto poÄ?ÃtaÄ?a je cenzurovanÃ©, filtrovanÃ© alebo sprostredkovanÃ©.">
-<!ENTITY torSettings.configurePrompt2 "Potrebujem nakonfigurovaÅ¥ nastavenia mostu, firewallu alebo proxy.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "KonfigurÃ¡cia">
 <!ENTITY torSettings.connectPrompt2 "Chcem sa pripojiÅ¥ priamo do siete Tor.">
 <!ENTITY torSettings.connectPrompt3 "Toto bude vo vÃ¤Ä?Å¡ine prÃpadov fungovaÅ¥.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ak si nieste istÃ½ ako odpovedaÅ¥ na tÃºto otÃ¡zku, pozrite sa Ä?i mÃ¡te nastavenÃ© pouÅ¾Ãvanie proxy v inom Internetovom prehliadaÄ?i.">
 <!ENTITY torSettings.enterProxy "VstÃºpiÅ¥ do nastavenÃ proxy.">
-<!ENTITY torSettings.firewallQuestion "PouÅ¾Ãva InternetovÃ© pripojenie tohto poÄ?ÃtaÄ?a brÃ¡nu firewall, ktorÃ¡ povoÄ¾uje pripojenia len na niektorÃ© porty?">
-<!ENTITY torSettings.firewallHelp "Ak si nieste istÃ½ ako odpovedaÅ¥ na tÃºto otÃ¡zku, zvoÄ¾te Nie. Ak narazÃte na problÃ©my s pripojenÃm do siete Tor, zmeÅ?te toto nastavenie.">
-<!ENTITY torSettings.enterFirewall "VloÅ¾te zoznam portov oddelenÃ½ Ä?iarkou, ktorÃ© sÃº povolenÃ© firewallom.">
 <!ENTITY torSettings.bridgeQuestion "Blokuje alebo nejak cenzuruje vÃ¡Å¡ PoskytovateÄ¾ Internetu (ISP) pripojenia k Sieti Tor?">
 <!ENTITY torSettings.bridgeHelp "Ak ste si nie istÃ½ ako zodpovedaÅ¥ tÃºto otÃ¡zku, zvoÄ¾te Nie.&#160; Ak zvolÃte Ã?no, budete vyzvanÃ½ na konfigurÃ¡ciu Mostov Toru, Ä?o sÃº nezaradenÃ© relÃ© znaÄ?ne sÅ¥aÅ¾ujÃºce blokovanie pripojenÃ k Sieti Tor.">
 <!ENTITY torSettings.bridgeSettingsPrompt "MÃ´Å¾ete pouÅ¾iÅ¥ poskytnutÃº sadu mostov alebo zÃskaÅ¥ a vloÅ¾iÅ¥ vlastnÃº sadu.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Cez Web">
 <!ENTITY torsettings.bridgeHelp2 "PouÅ¾ite webovÃ½ prehliadaÄ? na navÅ¡tÃvenie https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Cez Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "PoÅ¡lite email na adresu bridges@xxxxxxxxxxxxxx obsahujÃºcu jeden riadok 'get bridges' ako telo sprÃ¡vy.&#160; AvÅ¡ak, aby bolo pre ÃºtoÄ?nÃkov nÃ¡roÄ?nejÅ¡ie odhaliÅ¥ veÄ¾a mostovÃ½ch adries, musÃte tÃºto Å¾iadosÅ¥ poslaÅ¥ z emailovej adresy gmail.com alebo yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Cez Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "Ako poslednÃº moÅ¾nosÅ¥ si mÃ´Å¾ete vyÅ¾iadaÅ¥ adresy mostov zaslanÃm zdvorilÃ©ho emailu na adresu help@xxxxxxxxxxxxxxxxxx&#160; ProsÃme berte na vedomie, Å¾e prÃsluÅ¡nÃ¡ osoba musÃ odpovedaÅ¥ na kaÅ¾dÃº jednu podobnÃº Å¾iadosÅ¥.">
diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties
index 3bbcfcf..2280de6 100644
--- a/src/chrome/locale/sk/torlauncher.properties
+++ b/src/chrome/locale/sk/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=SpÃºÅ¡Å¥aÄ? Tor
 
-torlauncher.tor_exited=Tor bol neoÄ?akÃ¡vane ukonÄ?enÃ½.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Å½iadne poskytnutÃ© mosty nemajÃº dost
 torlauncher.recommended_bridge=(odporÃºÄ?anÃ©)
 
 torlauncher.connect=PripojiÅ¥
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=UkonÄ?iÅ¥
 torlauncher.quit_win=UkonÄ?iÅ¥
 torlauncher.done=Hotovo
 
 torlauncher.forAssistance=Pre podporu kontaktujte %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/sl-SI/network-settings.dtd
+++ b/src/chrome/locale/sl-SI/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/sl-SI/torlauncher.properties
+++ b/src/chrome/locale/sl-SI/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd
index 5d461aa..6f3da1a 100644
--- a/src/chrome/locale/sl/network-settings.dtd
+++ b/src/chrome/locale/sl/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ne">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties
index 11d70c8..c1f7981 100644
--- a/src/chrome/locale/sl/torlauncher.properties
+++ b/src/chrome/locale/sl/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor zaganjalnik
 
-torlauncher.tor_exited=Tor je se je nepredvideno zaustavil.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=PoveÅ¾i
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Zapusti
 torlauncher.quit_win=Izhod
 torlauncher.done=KonÄ?ano
 
 torlauncher.forAssistance=Za pomoÄ?, vzpostavite stik z %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/sn/network-settings.dtd
+++ b/src/chrome/locale/sn/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties
index 3d2d4e7..6e5b1e9 100644
--- a/src/chrome/locale/sn/torlauncher.properties
+++ b/src/chrome/locale/sn/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Buda
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/so/network-settings.dtd
+++ b/src/chrome/locale/so/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/so/torlauncher.properties
+++ b/src/chrome/locale/so/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/son/network-settings.dtd
+++ b/src/chrome/locale/son/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/son/torlauncher.properties
+++ b/src/chrome/locale/son/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd
index d3d0ac3..89b8a33 100644
--- a/src/chrome/locale/sq/network-settings.dtd
+++ b/src/chrome/locale/sq/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Jo">
 
 <!ENTITY torSettings.firstQuestion "Cila nga kÃ«to i pÃ«rshtatet mÃ« shumÃ« situatÃ«s tuaj aktuale?">
-<!ENTITY torSettings.configurePrompt1 "Lidhja internet e kÃ«tij kompjuteri Ã«shtÃ« e censuruar, e filtruar ose me pÃ«rfaqÃ«sim.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Konfiguro">
 <!ENTITY torSettings.connectPrompt2 "Do tÃ« dÃ«shiroja tÃ« lidhesha direkt me rrjetin Tor.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "NÃ«se nuk jeni i sigurt si ti pÃ«rgjigjeni kÃ«saj pyetjeje, shikoni parametrat e internetit nÃ« njÃ« shfletues tjetÃ«r tÃ« kÃ«tij kompjuteri pÃ«r tÃ« parÃ« nÃ«se Ã«shtÃ« konfiguruar qÃ« tÃ« pÃ«rdorÃ« pÃ«rfaqÃ«sues 'proxy'.">
 <!ENTITY torSettings.enterProxy "Jepni parametrat e pÃ«rfaqÃ«simit 'proxy'.">
-<!ENTITY torSettings.firewallQuestion "A kalon lidhja internet e kÃ«tij kompjuteri nÃ«pÃ«rmjet ndonjÃ« mbrojtesi 'firewall' i cili lejon lidhje vetÃ«m nÃ« disa porta?">
-<!ENTITY torSettings.firewallHelp "NÃ«se nuk jeni i sigurt si ti pÃ«rgjigjeni kÃ«saj pyetjeje, zgjidhni JO. NÃ«se keni probleme gjatÃ« lidhjes me rrjetin Tor, kthehuni kÃ«tu dhe ndryshoni kÃ«tÃ« parametÃ«r.">
-<!ENTITY torSettings.enterFirewall "Jepni njÃ« listÃ« tÃ« portave tÃ« lejuara nga mbrojtÃ«si 'firewall', tÃ« ndarÃ« me presje.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties
index 1c0489b..0b3ae2d 100644
--- a/src/chrome/locale/sq/torlauncher.properties
+++ b/src/chrome/locale/sq/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Lidhu
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Dil
 torlauncher.quit_win=Dil
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index b01fedf..0fb1cbf 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "NE">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties
index f7eef46..02ae889 100644
--- a/src/chrome/locale/sr/torlauncher.properties
+++ b/src/chrome/locale/sr/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Ð¢Ð¾r Ð?Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?
 
-torlauncher.tor_exited=Tor Ñ?Ðµ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð¸Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ð¾
-torlauncher.tor_connection_lost=Ð?Ð°Ñ?Ð° Ð²ÐµÐ·Ð° Ñ?Ð° Tor Ð¼Ñ?ÐµÐ¶Ð¾Ð¼ Ñ?Ðµ Ð¸Ð·Ð³Ñ?Ð±Ñ?ÐµÐ½Ð°
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Ð?Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Tor port Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾
 torlauncher.tor_failed_to_start=Tor Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ¾ Ð´Ð° Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ
 torlauncher.tor_control_failed=Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð½Ð°Ð´ Tor-om
@@ -25,18 +25,20 @@ torlauncher.error_proxy_addr_missing=Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð²ÐµÑ?Ñ?Ð¸ IP Ð°Ð´Ñ?ÐµÑ?Ñ?
 torlauncher.error_proxy_type_missing=Morate izabrati tip proxya.
 torlauncher.error_bridges_missing=Morate odrediti jedan ili vise mostova
 torlauncher.error_default_bridges_type_missing=Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð´Ð° Ð¾Ð´Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð¸Ð¿ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð° Ð·Ð° Ð¾Ð±ÐµÐ·Ð±ÐµÑ?ÐµÐ½Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ðµ
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
+torlauncher.error_bridge_bad_default_type=Ð?Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ðµ Ñ?Ñ?Ð»Ð¾Ð²Ð¸ Ð´Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ ÐºÐ¾Ñ?Ð¸ Ð¸Ð¼Ð°Ñ?Ñ?  Ñ?Ð¸Ð¿ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð° %S Ð±Ñ?Ð´Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸. Ð?Ð¾Ð»Ð¸Ð¼Ð¾ Ð?Ð°Ñ? Ð´Ð° Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ð´Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ.
 
 torlauncher.recommended_bridge=(Ð¿Ñ?ÐµÐ¿Ð¾Ñ?Ñ?Ñ?ÐµÐ½Ð¾)
 
 torlauncher.connect=Ð?Ð¾Ð²ÐµÐ¶Ð¸ Ñ?Ðµ
-torlauncher.reconnect=Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ¶Ð¸
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Ð?Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ð¸
 torlauncher.quit_win=Ð?Ð·Ð»Ð°Ð·
 torlauncher.done=Gotovo
 
 torlauncher.forAssistance=Ð?Ð° Ð¿Ð¾Ð¼Ð¾Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ %Ð?
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Ð?Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð° Ñ?ÐµÐ»ÐµÑ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð¾Ð¼
 torlauncher.bootstrapStatus.handshake_dir=Ð£Ñ?Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ðµ Ð²ÐµÐ·Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°
 torlauncher.bootstrapStatus.requesting_status=Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð¼Ñ?ÐµÐ¶Ð½Ð¾Ð³ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð°
diff --git a/src/chrome/locale/sr@latin/network-settings.dtd b/src/chrome/locale/sr@latin/network-settings.dtd
index d1bf809..840c452 100644
--- a/src/chrome/locale/sr@latin/network-settings.dtd
+++ b/src/chrome/locale/sr@latin/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ne">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/sr@latin/torlauncher.properties b/src/chrome/locale/sr@latin/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/sr@latin/torlauncher.properties
+++ b/src/chrome/locale/sr@latin/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/st/network-settings.dtd
+++ b/src/chrome/locale/st/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/st/torlauncher.properties
+++ b/src/chrome/locale/st/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/su/network-settings.dtd
+++ b/src/chrome/locale/su/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/su/torlauncher.properties
+++ b/src/chrome/locale/su/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index 32f8bec..3f71c94 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Nej">
 
 <!ENTITY torSettings.firstQuestion "Vilket av fÃ¶ljande beskriver bÃ¤st din situation?">
-<!ENTITY torSettings.configurePrompt1 "Denna dators internetanslutning Ã¤r censurerad, filtrerad, eller bakom en proxy.">
-<!ENTITY torSettings.configurePrompt2 "Jag behÃ¶ver konfigurera brygg-, brandvÃ¤gg- eller proxyinstÃ¤llningar.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Konfigurera">
 <!ENTITY torSettings.connectPrompt2 "Jag vill ansluta direkt till Tor-nÃ¤tverket.">
 <!ENTITY torSettings.connectPrompt3 "Detta fungerar i de flesta situationer.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ denna frÃ¥ga, titta efter i Internet-instÃ¤llningarna i en annan webblÃ¤sare fÃ¶r att se om den Ã¤r konfigurerad att anvÃ¤nda en proxy.">
 <!ENTITY torSettings.enterProxy "Ange proxyinstÃ¤llningarna.">
-<!ENTITY torSettings.firewallQuestion "Ansluter den hÃ¤r datorn till Internet genom en brandvÃ¤gg som bara tillÃ¥ter anslutningar pÃ¥ vissa specifika portar?">
-<!ENTITY torSettings.firewallHelp "Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ denna frÃ¥ga, vÃ¤lj Nej. Om du dÃ¥ fÃ¥r problem med att ansluta till Tor-nÃ¤tverket, Ã¤ndra denna instÃ¤llning till Ja.">
-<!ENTITY torSettings.enterFirewall "Ange en komma-separerad lista Ã¶ver portar som brandvÃ¤ggen tillÃ¥ter.">
 <!ENTITY torSettings.bridgeQuestion "Blockerar eller censurerar din internetleverantÃ¶r anslutningar till Tor-nÃ¤tverket?">
 <!ENTITY torSettings.bridgeHelp "Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ den hÃ¤r frÃ¥gan, vÃ¤lj Nej.&#160; Om du vÃ¤ljer Ja kommer du ombes att konfigurera Tor-bryggor, vilka Ã¤r olistade relÃ¤er som gÃ¶r det svÃ¥rare att blockera anslutningar till Tor-nÃ¤tverket.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Du kan anvÃ¤nda de fÃ¶rkonfigurerade bryggorna, eller skaffa och ange bryggor sjÃ¤lv.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Via nÃ¤tet">
 <!ENTITY torsettings.bridgeHelp2 "AnvÃ¤nd en webblÃ¤sare fÃ¶r att besÃ¶ka https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">
-<!ENTITY torsettings.bridgeHelp3 "Skicka ett e-post meddelande till bridges@xxxxxxxxxxxxxx med endast raden &quot;get bridges&quot; i texten.&#160; Emellertid, fÃ¶r att gÃ¶ra det svÃ¥rare fÃ¶r en angripare Ã¤r ta reda pÃ¥ en massa bryggadresser, mÃ¥ste du skicka detta meddelande frÃ¥n ett gmail.com eller yahoo.com konto.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Via supporten">
 <!ENTITY torsettings.bridgeHelp4 "Som en sista utvÃ¤g kan du skicka ett artigt e-post meddelande pÃ¥ engelska till help@xxxxxxxxxxxxxxxxx, och frÃ¥ga efter bryggadresser.&#160; TÃ¤nk pÃ¥ att en person mÃ¥ste svara pÃ¥ varje sÃ¥dan fÃ¶rfrÃ¥gan.">
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties
index 9397a1e..d23b5e7 100644
--- a/src/chrome/locale/sv/torlauncher.properties
+++ b/src/chrome/locale/sv/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor stÃ¤ngdes av ovÃ¤ntat.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Det finns inga fÃ¶rkonfigurerade brygg
 torlauncher.recommended_bridge=(rekommenderas)
 
 torlauncher.connect=Anslut
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Avsluta
 torlauncher.quit_win=StÃ¤ng
 torlauncher.done=Klar
 
 torlauncher.forAssistance=FÃ¶r assistans, kontakta %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Ansluter till en relÃ¤katalog
 torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning
 torlauncher.bootstrapStatus.requesting_status=HÃ¤mtar nÃ¤tverksstatus
diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/sw/network-settings.dtd
+++ b/src/chrome/locale/sw/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/sw/torlauncher.properties
+++ b/src/chrome/locale/sw/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/szl/network-settings.dtd
+++ b/src/chrome/locale/szl/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/szl/torlauncher.properties
+++ b/src/chrome/locale/szl/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index 3671894..10b38ab 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "à®?à®²à¯?à®²à¯?">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?">
 <!ENTITY torSettings.connectPrompt2 "à®¨à®¾à®©à¯? Tor à®µà®²à¯?à®¯à®®à¯?à®ªà¯?à®ªà®¿à®²à¯? à®¨à¯?à®°à®?à®¿à®¯à®¾à®? à®?à®£à¯?à®?à¯?à®? à®µà®¿à®°à¯?à®®à¯?à®ªà¯?à®?à®¿à®±à¯?à®©à¯?.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties
index 299f992..079d758 100644
--- a/src/chrome/locale/ta/torlauncher.properties
+++ b/src/chrome/locale/ta/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor à®¤à¯?à®µà®?à¯?à®?à®¿
 
-torlauncher.tor_exited=Tor à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®µà®¿à®¤à®®à®¾à®? à®µà¯?à®³à®¿à®¯à¯?à®±à®¿à®µà®¿à®?à¯?à®?à®¤à¯?.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=Tor à®?à®?à¯?à®?à¯?à®ªà¯?à®ªà®¾à®?à¯?à®?à¯? à®¤à¯?à®±à¯?à®¯à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?.
 torlauncher.tor_failed_to_start=Tor à®¤à¯?à®¾à®?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?.
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=à®?à®£à¯?à®?à¯?à®?
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=à®µà®¿à®?à¯?à®µà®¿
 torlauncher.quit_win=à®µà¯?à®³à®¿à®¯à¯?à®±à¯?
 torlauncher.done=à®®à¯?à®?à®¿à®¨à¯?à®¤à®¤à¯?
 
 torlauncher.forAssistance=à®?à®¤à®µà®¿à®?à¯?à®?à¯?, à®¤à¯?à®¾à®?à®°à¯?à®ªà¯? à®?à¯?à®¾à®³à¯?à®³à¯?à®?à¯?à®?à®³à¯? %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/te-IN/network-settings.dtd
+++ b/src/chrome/locale/te-IN/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/te-IN/torlauncher.properties
+++ b/src/chrome/locale/te-IN/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/te/network-settings.dtd
+++ b/src/chrome/locale/te/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/te/torlauncher.properties
+++ b/src/chrome/locale/te/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/tg/network-settings.dtd
+++ b/src/chrome/locale/tg/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/tg/torlauncher.properties
+++ b/src/chrome/locale/tg/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd
index 3781102..53b0202 100644
--- a/src/chrome/locale/th/network-settings.dtd
+++ b/src/chrome/locale/th/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "à¹?à¸¡à¹?à¹?à¸?à¹?">
 
 <!ENTITY torSettings.firstQuestion "à¸ªà¸´à¹?à¸?à¸?à¹?à¸à¹?à¸?à¸?à¸µà¹?à¸à¸±à¸?à¹?à¸«à¸?à¸?à¹?à¸²à¸?à¸?à¸µà¹?à¸?à¸£à¸£à¸¢à¸²à¸¢à¸¥à¸±à¸?à¸©à¸?à¸°à¸ªà¸?à¸²à¸?à¸?à¸²à¸£à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?">
-<!ENTITY torSettings.configurePrompt1 "à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?à¸?à¸à¸?à¸?à¸à¸¡à¸?à¸´à¸§à¹?à¸?à¸à¸£à¹?à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸?à¸µà¹?à¹?à¸?à¹?à¸?à¸¹à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¸à¸£à¹? à¸?à¸¹à¸?à¸?à¸£à¸à¸? à¸«à¸£à¸·à¸à¹?à¸?à¹?à¸?à¸²à¸?à¸?à¹?à¸²à¸?à¸?à¸£à¹?à¸à¸?à¸?à¸µ">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "à¸?à¸£à¸±à¸?à¹?à¸?à¹?à¸?">
 <!ENTITY torSettings.connectPrompt2 "à¸?à¸±à¸?à¸à¸¢à¸²à¸?à¸?à¸°à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¸¢à¸?à¸£à¸?à¸?à¸±à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ Tor">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "à¸?à¹?à¸²à¸?à¸¸à¸?à¹?à¸¡à¹?à¹?à¸?à¹?à¹?à¸?à¸§à¹?à¸²à¸?à¸°à¸?à¸à¸?à¸?à¸³à¸?à¸²à¸¡à¸?à¸µà¹?à¸¢à¸±à¸?à¹?à¸? à¹?à¸«à¹?à¸?à¸¹à¸?à¹?à¸²à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¸£à¹?à¸?à¸£à¸¡à¸à¸·à¹?à¸?à¹?à¸§à¹?à¸²à¸?à¸¹à¸?à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸«à¹?à¹?à¸?à¹?à¸?à¸£à¹?à¸à¸?à¸?à¸µà¸«à¸£à¸·à¸à¹?à¸¡à¹?">
 <!ENTITY torSettings.enterProxy "à¹?à¸ªà¹?à¸?à¹?à¸²à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸?à¸£à¹?à¸à¸?à¸?à¸µ">
-<!ENTITY torSettings.firewallQuestion "à¸?à¸à¸¡à¸?à¸´à¸§à¹?à¸?à¸à¸£à¹?à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸?à¸µà¹?à¹?à¸?à¹?à¸?à¸²à¸?à¸?à¹?à¸²à¸?à¹?à¸?à¸£à¹?à¸§à¸à¸¥à¸¥à¹?à¸?à¸µà¹?à¸¢à¸´à¸?à¸¢à¸à¸¡à¸?à¸µà¹?à¸?à¸°à¹?à¸«à¹?à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸?à¸?à¸²à¸?à¸?à¸à¸£à¹?à¸?à¹?à¸?à¹?à¸²à¸?à¸±à¹?à¸?à¸«à¸£à¸·à¸à¹?à¸¡à¹??">
-<!ENTITY torSettings.firewallHelp "à¸?à¹?à¸²à¸?à¸¸à¸?à¹?à¸¡à¹?à¹?à¸?à¹?à¹?à¸?à¸§à¹?à¸²à¸?à¸°à¸?à¸à¸?à¸?à¸³à¸?à¸²à¸¡à¸¢à¸±à¸?à¹?à¸?à¹?à¸«à¹?à¹?à¸¥à¸·à¸à¸? &quot;à¹?à¸¡à¹?&quot; à¸?à¹?à¸²à¸?à¸¸à¸?à¸?à¸£à¸°à¸ªà¸?à¸?à¸±à¸?à¸«à¸²à¹?à¸?à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ Tor à¹?à¸«à¹?à¸?à¸¥à¸±à¸?à¸¡à¸²à¹?à¸?à¸¥à¸µà¹?à¸¢à¸?à¸?à¹?à¸²à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸?à¸µà¹?">
-<!ENTITY torSettings.enterFirewall "à¹?à¸ªà¹?à¸£à¸²à¸¢à¸?à¸²à¸£à¸?à¸à¸£à¹?à¸?à¸?à¸µà¹?à¹?à¸?à¸£à¹?à¸§à¸à¸¥à¸¥à¹?à¸à¸?à¸¸à¸?à¸²à¸?à¹?à¸?à¸¢à¸?à¸±à¹?à¸?à¸?à¹?à¸§à¸¢à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸«à¸¡à¸²à¸¢à¸?à¸¸à¸¥à¸ à¸²à¸?">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties
index 3691169..f5ac6d9 100644
--- a/src/chrome/locale/th/torlauncher.properties
+++ b/src/chrome/locale/th/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=à¸?à¸±à¸§à¹?à¸?à¸´à¸? Tor
 
-torlauncher.tor_exited=Tor à¸à¸à¸?à¸?à¸²à¸?à¹?à¸?à¸£à¹?à¸?à¸£à¸¡à¹?à¸?à¸¢à¹?à¸¡à¹?à¸?à¸²à¸?à¸?à¸´à¸?
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 torlauncher.tor_controlconn_failed=à¹?à¸¡à¹?à¸ªà¸²à¸¡à¸²à¸£à¸?à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸?à¸?à¸à¸£à¹?à¸?à¸?à¸§à¸?à¸?à¸¸à¸¡à¸?à¸à¸? Tor à¹?à¸?à¹?
 torlauncher.tor_failed_to_start=à¸?à¸²à¸£à¹?à¸£à¸´à¹?à¸¡ Tor à¸¥à¹?à¸¡à¹?à¸«à¸¥à¸§
 torlauncher.tor_control_failed=Failed to take control of Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=à¸à¸à¸?
 torlauncher.quit_win=à¸à¸à¸?
 torlauncher.done=à¸ªà¸³à¹?à¸£à¹?à¸?
 
 torlauncher.forAssistance=à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸³à¹?à¸?à¸°à¸?à¸³ à¸?à¸´à¸?à¸?à¹?à¸ %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=à¸?à¸³à¸¥à¸±à¸?à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸? à¸?à¸¥à¸±à¸?à¹?à¸?à¹?à¸?à¸£à¸²à¸¢à¸?à¸·à¹?à¸ relay (relay directory)
 torlauncher.bootstrapStatus.handshake_dir=à¸?à¸³à¸¥à¸±à¸?à¸ªà¸£à¹?à¸²à¸?à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¸?à¹?à¸?à¹?à¸²à¸£à¸«à¸±à¸ªà¸?à¸±à¸?à¸?à¸¥à¸±à¸?à¹?à¸?à¹?à¸?à¸£à¸²à¸¢à¸?à¸·à¹?à¸
 torlauncher.bootstrapStatus.requesting_status=à¸?à¸³à¸¥à¸±à¸?à¸?à¸£à¸§à¸?à¸ªà¸?à¸²à¸?à¸°à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢
diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ti/network-settings.dtd
+++ b/src/chrome/locale/ti/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ti/torlauncher.properties
+++ b/src/chrome/locale/ti/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/tk/network-settings.dtd
+++ b/src/chrome/locale/tk/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/tk/torlauncher.properties
+++ b/src/chrome/locale/tk/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index e08c7df..6642c29 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "HayÄ±r">
 
 <!ENTITY torSettings.firstQuestion "AÅ?aÄ?Ä±dakilerden hangisi durumunuzu en iyi aÃ§Ä±klÄ±yor?">
-<!ENTITY torSettings.configurePrompt1 "Ä°nternet baÄ?lantÄ±nÄ±z sansÃ¼rlenmiÅ?, filtrelenmiÅ? veya vekil sunucu altÄ±nda.">
-<!ENTITY torSettings.configurePrompt2 "KÃ¶prÃ¼, gÃ¼venlik duvarÄ± ve vekil sunucu ayarlarÄ±nÄ± yapÄ±landÄ±rmam gerekli.">
+<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarÄ±n internet baÄ?lantÄ±sÄ± sansÃ¼rlÃ¼ veya vekil sunucu arkasÄ±nda.">
+<!ENTITY torSettings.configurePrompt2 "KÃ¶prÃ¼ veya vekil sunucu ayarlarÄ±nÄ± yapÄ±landÄ±rmam gerekli.">
 <!ENTITY torSettings.configure "YapÄ±landÄ±r">
 <!ENTITY torSettings.connectPrompt2 "DoÄ?rudan Tor aÄ?Ä±na baÄ?lanmak istiyorum">
 <!ENTITY torSettings.connectPrompt3 "Bu Ã§oÄ?u durumda Ã§alÄ±Å?Ä±r.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "EÄ?er bu soruyu nasÄ±l yanÄ±tlayacaÄ?Ä±nÄ±zdan emin deÄ?ilseniz, farklÄ± bir tarayÄ±cÄ±da Ä°nternet seÃ§eneklerine bakÄ±n ve bir vekil kullanmak Ã¼zere yapÄ±landÄ±rÄ±lÄ±p yapÄ±landÄ±rÄ±lmadÄ±Ä?Ä±na bakÄ±n">
 <!ENTITY torSettings.enterProxy "Vekil ayarlarÄ±nÄ± girin.">
-<!ENTITY torSettings.firewallQuestion "Bu bilgisayarÄ±n Ä°nternet baÄ?lantÄ±sÄ±, sadece belirli baÄ?lantÄ± noktalarÄ±na izin veren bir gÃ¼venlik duvarÄ±ndan geÃ§iyor mu?">
-<!ENTITY torSettings.firewallHelp "EÄ?er bu soruya nasÄ±l cevap vereceÄ?inizden emin deÄ?ilseniz, HayÄ±r seÃ§in. EÄ?er Tor aÄ?Ä±na baÄ?lanÄ±rken sorunla karÅ?Ä±laÅ?Ä±rsanÄ±z, bu ayarÄ± deÄ?iÅ?tirin.">
-<!ENTITY torSettings.enterFirewall "GÃ¼venlik duvarÄ± tarafÄ±ndan izin verilen baÄ?lantÄ± noktalarÄ±nÄ±n virgÃ¼lle ayrÄ±lmÄ±Å? bir listesini girin.">
 <!ENTITY torSettings.bridgeQuestion "Ä°nternet Servis SaÄ?layÄ±cÄ±nÄ±z (ISS) Tor AÄ?Ä±na baÄ?lantÄ±larÄ± engelliyor veya sansÃ¼rlÃ¼yor mu?">
 <!ENTITY torSettings.bridgeHelp "Bu soruyu nasÄ±l cevaplayacaÄ?Ä±nÄ±zdan emin deÄ?ilseniz HayÄ±r'Ä± SeÃ§in.&#160; EÄ?er Evet'i seÃ§erseniz, Tor AÄ?Ä±na baÄ?lantÄ±yÄ± engellemeyi daha zor hale getiren listelenmeyen aynalar olan Tor KÃ¶prÃ¼lerini yapÄ±landÄ±rmanÄ±z istenecektir.">
 <!ENTITY torSettings.bridgeSettingsPrompt "SaÄ?lanan kÃ¶prÃ¼lerin kÃ¼mesini kullanabilirsiniz veya Ã¶zel bir kÃ¶prÃ¼ seti girebilir veya saÄ?layabilirsiniz.">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Tor'un baÅ?lamasÄ± bekleniyor...">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Tor'u Yeniden BaÅ?lat">
 
 <!ENTITY torsettings.optional "Ä°steÄ?e BaÄ?lÄ±">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Web aracÄ±lÄ±Ä?Ä±yla.">
 <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org sitesini ziyaret etmek iÃ§in web tarayÄ±cÄ±sÄ± kullanÄ±n.">
 <!ENTITY torsettings.bridgeHelp3Heading "E-posta Otomatik CevaplandÄ±rÄ±cÄ± AracÄ±lÄ±Ä?Ä±yla">
-<!ENTITY torsettings.bridgeHelp3 "bridges@xxxxxxxxxxxxxx adresine, iletide sadece 'get bridges' satÄ±rÄ±nÄ± yazarak bir e-posta gÃ¶nderin.&#160; Ancak, bir saldÄ±rganÄ±n Ã§ok sayÄ±da kÃ¶prÃ¼ adresi Ã¶Ä?renmesini zorlaÅ?tÄ±rmak iÃ§in bu e-postayÄ± gmail.com veya yahoo.com adreslerinden yollamanÄ±z gerekmektedir.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "bridges@xxxxxxxxxxxxxx adresine, iletide sadece 'get bridges' satÄ±rÄ±nÄ± yazarak bir e-posta gÃ¶nderin.&#160; Ancak, bir saldÄ±rganÄ±n Ã§ok sayÄ±da kÃ¶prÃ¼ adresi Ã¶Ä?renmesini zorlaÅ?tÄ±rmak iÃ§in bu e-postayÄ± aÅ?aÄ?Ä±daki e-posta saÄ?layÄ±cÄ±larÄ±ndan yollamanÄ±z gerekmektedir (tercih sÄ±rasÄ±na gÃ¶re listelenmiÅ?tir):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com veya https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Help Desk aracÄ±lÄ±Ä?Ä±yla.">
 <!ENTITY torsettings.bridgeHelp4 "Son bir Ã§are olarak kÃ¶prÃ¼ adres taleplerini help@xxxxxxxxxxxxxxxxx adresine posta gÃ¶ndererek rica edebilirsiniz.&#160; Birisinin bu talebi cevaplayacaÄ?Ä±nÄ± unutmayÄ±n.">
diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd
index c61e5ac..4a46cde 100644
--- a/src/chrome/locale/tr/progress.dtd
+++ b/src/chrome/locale/tr/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor Durumu">
 <!ENTITY torprogress.openSettings "AyarlarÄ± AÃ§">
 <!ENTITY torprogress.heading "Tor aÄ?Ä±na baÄ?lanÄ±yor">
-<!ENTITY torprogress.pleaseWait "Biz Tor Å?ebekesi ile baÄ?lantÄ± kurana lÃ¼tfen bekleyin.">
+<!ENTITY torprogress.pleaseWait "Biz Tor Å?ebekesi ile baÄ?lantÄ± kurana kadar lÃ¼tfen bekleyin.">
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index 8718c38..0b57c1e 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor BaÅ?latÄ±cÄ±
 
-torlauncher.tor_exited=Tor beklenmedik bir Å?ekilde kapandÄ±.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor, beklenmedik Å?ekilde sonlandÄ±. Bu; Tor iÃ§erisinde veya sisteminizdeki farklÄ± bir programda bir hatadan ya da sorunlu bir donanÄ±mdan kaynaklanmÄ±Å? olabilir. Tor'u yeniden baÅ?latÄ±ncaya kadar Tor TarayÄ±cÄ±sÄ± hiÃ§bir web sitesine eriÅ?emeyecek. EÄ?er sorun devam ederse lÃ¼tfen Tor GÃ¼nlÃ¼Ä?Ã¼nÃ¼zÃ¼n bir kopyasÄ±nÄ± destek takÄ±mÄ±na gÃ¶nderin.
+torlauncher.tor_exited2=Tor'u yeniden baÅ?latmak tarayÄ±cÄ± sekmelerinizi kapatmayacak.
 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
@@ -21,7 +21,7 @@ torlauncher.failed_to_get_settings=Tor ayarlarÄ±na ulaÅ?Ä±lamÄ±yor.\n\n%S
 torlauncher.failed_to_save_settings=Tor ayarlarÄ± kaydedilemiyor.\n\n%S
 torlauncher.ensure_tor_is_running=LÃ¼tfen Tor'un Ã§alÄ±Å?tÄ±Ä?Ä±ndan emin olun.
 
-torlauncher.error_proxy_addr_missing=Ä°nternet baÄ?lanÄ±rken vekil sunucu kullanmak iÃ§in IP adresi veya sunucu ve baÄ?lantÄ± noktasÄ± numarasÄ± girmeniz gerekiyor.
+torlauncher.error_proxy_addr_missing=Ä°nternete baÄ?lanÄ±rken vekil sunucusu kullanmak iÃ§in IP adresi veya sunucu ve baÄ?lantÄ± noktasÄ± numarasÄ± girmeniz gerekiyor.
 torlauncher.error_proxy_type_missing=Vekil sunucu tÃ¼rÃ¼nÃ¼ seÃ§melisiniz.
 torlauncher.error_bridges_missing=Bir ya da daha fazla kÃ¶prÃ¼ belirtmelisiniz.
 torlauncher.error_default_bridges_type_missing=SaÄ?lanan kÃ¶prÃ¼ler iÃ§in bir aktarÄ±m tÃ¼rÃ¼ seÃ§melisiniz.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=%S aktarÄ±m tÃ¼rÃ¼ iÃ§in saÄ?lanan kul
 torlauncher.recommended_bridge=(Ã¶nerilen)
 
 torlauncher.connect=BaÄ?lan
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Tor'u Yeniden BaÅ?lat
 torlauncher.quit=Ã?Ä±k
 torlauncher.quit_win=Ã?Ä±kÄ±Å?
 torlauncher.done=TamamlandÄ±
 
 torlauncher.forAssistance=YardÄ±m iÃ§in %S ile baÄ?lantÄ±ya geÃ§in.
 
+torlauncher.copiedNLogMessages=Kopyalama tamamlandÄ±. %S Tor gÃ¼nlÃ¼k mesajlarÄ± bir metin dÃ¼zenleyici veya bir e-posta iletisine kopyalanmaya hazÄ±r.
+
 torlauncher.bootstrapStatus.conn_dir=Bir ayna dizinine baÄ?lanÄ±yor
 torlauncher.bootstrapStatus.handshake_dir=Å?ifrelenmiÅ? dizin baÄ?lantÄ±sÄ± kuruluyor
 torlauncher.bootstrapStatus.requesting_status=AÄ? durumu gÃ¼ncelliyor
diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd
index 10ff964..0090d60 100644
--- a/src/chrome/locale/uk/network-settings.dtd
+++ b/src/chrome/locale/uk/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ð?Ñ?">
 
 <!ENTITY torSettings.firstQuestion "Ð¯ÐºÐµ Ð· Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ñ?Ð²ÐµÑ?Ð´Ð¶ÐµÐ½Ñ? Ð½Ð°Ð¹ÐºÑ?Ð°Ñ?Ðµ Ð¾Ð¿Ð¸Ñ?Ñ?Ñ? Ð?Ð°Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ñ?Ñ??">
-<!ENTITY torSettings.configurePrompt1 "Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ðµ Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'Ñ?Ñ?ÐµÑ?Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?, Ñ?Ñ?Ð»Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð°Ð±Ð¾ Ð¹Ð´Ðµ Ñ?ÐµÑ?ÐµÐ· Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?.">
-<!ENTITY torSettings.configurePrompt2 "Ð?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ð¾ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¼Ñ?Ñ?Ñ?, Ð±Ñ?Ð°Ð½Ð´Ð¼Ð°Ñ?ÐµÑ? Ð°Ð±Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?.">
+<!ENTITY torSettings.configurePrompt1 "Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ðµ Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'Ñ?Ñ?ÐµÑ?Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð°Ð±Ð¾ Ð¹Ð´Ðµ Ñ?ÐµÑ?ÐµÐ· Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?.">
+<!ENTITY torSettings.configurePrompt2 "Ð?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ð¾ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¼Ñ?Ñ?Ñ? Ð°Ð±Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ñ?-Ñ?ÐµÑ?Ð²ÐµÑ?.">
 <!ENTITY torSettings.configure "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?">
 <!ENTITY torSettings.connectPrompt2 "Ð¯ Ð±Ð°Ð¶Ð°Ñ? Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ? Ð´Ð¾ Tor Ð½Ð°Ð¿Ñ?Ñ?Ð¼Ñ? ">
 <!ENTITY torSettings.connectPrompt3 "Ð¦Ðµ Ð¼Ð°Ñ? Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ? Ð±Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ñ?Ð¹.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "Ð¯ÐºÑ?Ð¾ Ð?Ð¸ Ð½Ðµ Ð·Ð½Ð°Ñ?Ñ?Ðµ, Ñ?Ðº Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð½Ð° Ñ?Ðµ Ð¿Ð¸Ñ?Ð°Ð½Ð½Ñ?, Ð¿Ð¾Ð´Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ? Ð² Ñ?Ð½Ñ?Ð¾Ð¼Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ñ?, Ñ?Ð¾Ð± Ð¿Ð¾Ð±Ð°Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¸ Ð²Ñ?Ð½ Ð½Ð°Ð»Ð°Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ñ?.">
 <!ENTITY torSettings.enterProxy "Ð?Ð°Ð´Ð°Ñ?Ð¸ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ñ?">
-<!ENTITY torSettings.firewallQuestion "Ð§Ð¸ Ð´Ð°Ð½Ð¸Ð¹ ÐºÐ¾Ð¼Ð¿'Ñ?Ñ?ÐµÑ? Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¹ Ð´Ð¾ Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ? Ñ?ÐµÑ?ÐµÐ· Ð±Ñ?Ð°Ð½Ð´Ð¼Ð°Ñ?ÐµÑ?, Ñ?ÐºÐ¸Ð¹ Ð´Ð¾Ð·Ð²Ð¾Ð»Ñ?Ñ? Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ñ? Ñ?Ñ?Ð»Ñ?ÐºÐ¸ Ð´Ð¾ Ð¿ÐµÐ²Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð²?">
-<!ENTITY torSettings.firewallHelp "Ð¯ÐºÑ?Ð¾ Ð?Ð¸ Ð½Ðµ Ð·Ð½Ð°Ñ?Ñ?Ðµ, Ñ?Ðº Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð½Ð° Ñ?Ðµ Ð¿Ð¸Ñ?Ð°Ð½Ð½Ñ?, Ð²Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð?Ñ?. Ð¯ÐºÑ?Ð¾ Ñ? Ð?Ð°Ñ? Ð²Ð¸Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð· Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ñ?Ð¼ Ð´Ð¾ Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor, Ð·Ð¼Ñ?Ð½Ñ?Ñ?Ñ? Ð´Ð°Ð½Ðµ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?.">
-<!ENTITY torSettings.enterFirewall "Ð?Ð²ÐµÐ´Ñ?Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¿Ð¾Ñ?Ñ?Ñ?Ð², Ð²Ñ?Ð´ÐºÑ?Ð¸Ñ?Ð¸Ñ? Ñ? Ð±Ñ?Ð°Ð½Ð´Ð¼Ð°Ñ?ÐµÑ?Ñ?, Ñ?ÐµÑ?ÐµÐ· ÐºÐ¾Ð¼Ñ?.">
 <!ENTITY torSettings.bridgeQuestion "Ð?Ð°Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÑ?Ñ? Ñ?Ð¸ Ñ?ÐºÐ¸Ð¼-Ð½ÐµÐ±Ñ?Ð´Ñ? Ñ?Ð¸Ð½Ð¾Ð¼ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ñ? Ð´Ð¾ Tor Ð¼ÐµÑ?ÐµÐ¶Ñ??">
 <!ENTITY torSettings.bridgeHelp "Ð¯ÐºÑ?Ð¾ Ð?Ð¸ Ð½Ðµ Ð·Ð½Ð°Ñ?Ñ?Ðµ, Ñ?Ðº Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð½Ð° Ñ?Ðµ Ð¿Ð¸Ñ?Ð°Ð½Ð½Ñ?, Ð²Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð?Ñ?.&#160; Ð¯ÐºÑ?Ð¾ Ð?Ð¸ Ð²Ð¸Ð±ÐµÑ?ÐµÑ?Ðµ Ð¢Ð°Ðº, Ð?Ð°Ð¼ Ð±Ñ?Ð´Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ð¿Ð¾Ð½Ð¾Ð²Ð°Ð½Ð¾ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸ Tor, Ñ?Ð¾ Ñ? Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¸Ð¼Ð¸ Ñ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð°Ð¼Ð¸, Ñ?ÐºÑ? Ñ?Ð¾Ð±Ð»Ñ?Ñ?Ñ? Ð±Ñ?Ð»Ñ?Ñ? Ð²Ð°Ð¶ÐºÐ¸Ð¼ Ð±Ð»Ð¾ÐºÑ?Ð²Ð°Ð½Ð½Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ñ? Ð· Tor Ð¼ÐµÑ?ÐµÐ¶Ñ?.">
 <!ENTITY torSettings.bridgeSettingsPrompt "Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸ Ð²Ð¸Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ð¹ Ð¿ÐµÑ?ÐµÐ»Ñ?Ðº Ð¼Ð¾Ñ?Ñ?Ñ?Ð² Ð°Ð±Ð¾ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ñ? Ð²Ð²ÐµÑ?Ñ?Ð¸ Ð½Ð°Ð±Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð² Ð²Ñ?Ñ?Ñ?Ð½Ñ?.">
@@ -29,7 +26,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Ð?Ñ?Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ñ? Ð´Ð¾ Tor...">
-<!ENTITY torsettings.restartTor "Restart Tor">
+<!ENTITY torsettings.restartTor "Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ð¸ Tor">
 
 <!ENTITY torsettings.optional "Ð?Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ð¾">
 
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Ð§ÐµÑ?ÐµÐ· Ð?ÐµÐ±">
 <!ENTITY torsettings.bridgeHelp2 "Ð?Ñ?Ð´Ð²Ñ?Ð´Ð°Ð¹Ñ?Ðµ Ñ?Ñ?Ð¾Ñ?Ñ?Ð½ÐºÑ? https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Ð§ÐµÑ?ÐµÐ· Ð°Ð²Ñ?Ð¾Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ð´Ð°Ñ? ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸">
-<!ENTITY torsettings.bridgeHelp3 "Ð?Ð°Ð´Ñ?Ñ?Ð»Ñ?Ñ?Ñ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? bridges@xxxxxxxxxxxxxx Ð·Ñ? Ñ?Ñ?Ñ?Ñ?Ñ?ÐºÐ¾Ñ? &quot;get bridges&quot; Ñ? Ñ?Ñ?Ð»Ñ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?.&#160; Ð?Ñ?Ð¾Ñ?Ðµ, Ð´Ð»Ñ? Ñ?Ð¾Ð³Ð¾, Ñ?Ð¾Ð± Ñ?Ñ?ÐºÐ»Ð°Ð´Ð½Ð¸Ñ?Ð¸ Ð²Ð¸Ð·Ð½Ð°Ñ?ÐµÐ½Ð½Ñ? Ð²ÐµÐ»Ð¸ÐºÐ¾Ñ? ÐºÑ?Ð»Ñ?ÐºÐ¾Ñ?Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð² Ð·Ð»Ð¾Ð²Ð¼Ð¸Ñ?Ð½Ð¸ÐºÐ°Ð¼Ð¸, Ð½ÐµÐ¾Ð±Ñ?Ñ?Ð´Ð½Ð¾ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?ÐµÐ¹ Ð·Ð°Ð¿Ð¸Ñ? Ð²Ñ?Ð´ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ñ? Ñ?ÐºÑ?Ð¸Ð½Ñ?ÐºÐ¸ gmail.com Ð°Ð±Ð¾ yahoo.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Ð?Ð°Ð´Ñ?Ñ?Ð»Ñ?Ñ?Ñ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? bridges@xxxxxxxxxxxxxx Ñ?Ð· Ñ?Ñ?Ð´ÐºÐ¾Ð¼ &quot;get bridges&quot; Ñ? Ñ?Ñ?Ð»Ñ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?.&#160; Ð?Ñ?Ð¾Ñ?Ðµ, Ð´Ð»Ñ? Ñ?Ð¾Ð³Ð¾, Ñ?Ð¾Ð± Ñ?Ñ?ÐºÐ»Ð°Ð´Ð½Ð¸Ñ?Ð¸ Ð²Ð¸Ð·Ð½Ð°Ñ?ÐµÐ½Ð½Ñ? Ð²ÐµÐ»Ð¸ÐºÐ¾Ñ? ÐºÑ?Ð»Ñ?ÐºÐ¾Ñ?Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð² Ð·Ð»Ð¾Ð²Ð¼Ð¸Ñ?Ð½Ð¸ÐºÐ°Ð¼Ð¸, Ð½ÐµÐ¾Ð±Ñ?Ñ?Ð´Ð½Ð¾ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?ÐµÐ¹ Ð·Ð°Ð¿Ð¸Ñ? Ð²Ñ?Ð´ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ñ? Ñ?ÐºÑ?Ð¸Ð½Ñ?ÐºÐ¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð· Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð¸ÐºÑ?Ð² (Ð¿ÐµÑ?ÐµÑ?Ð°Ñ?Ð¾Ð²Ð°Ð½Ð¾ Ñ? Ð¿Ð¾Ñ?Ñ?Ð´ÐºÑ? Ð¿Ñ?Ñ?Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ð½Ð¾Ñ?Ñ?Ñ?):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com Ð°Ð±Ð¾ https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Ð§ÐµÑ?ÐµÐ· Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?">
 <!ENTITY torsettings.bridgeHelp4 "Ð£ ÐºÑ?Ð°Ð¹Ð½Ñ?Ð¾Ð¼Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÑ?, Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?, Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ð²Ñ?Ð¸ Ð²Ð²Ñ?Ñ?Ð»Ð¸Ð²Ðµ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ?  help@xxxxxxxxxxxxxxxxxx&#160; Ð?Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ñ?Ð²Ð°Ð³Ñ? Ð½Ð° Ñ?Ðµ, Ñ?Ð¾ ÐºÐ¾Ð¶ÐµÐ½ Ð·Ð°Ð¿Ð¸Ñ? Ð¾Ð±Ñ?Ð¾Ð±Ð»Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð»Ñ?Ð´Ð¸Ð½Ð¾Ñ?.">
diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties
index 05891cd..8287a1f 100644
--- a/src/chrome/locale/uk/torlauncher.properties
+++ b/src/chrome/locale/uk/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Ð?Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ñ?Ð²Ð°Ñ? Tor
 
-torlauncher.tor_exited=Tor Ð½ÐµÑ?Ð¿Ð¾Ð´Ñ?Ð²Ð°Ð½Ð¾ Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ð²Ñ?Ñ?.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor Ð½ÐµÑ?Ð¿Ð¾Ð´Ñ?Ð²Ð°Ð½Ð¾ Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ð² Ñ?Ð¾Ð±Ð¾Ñ?Ñ?. Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ñ?Ñ?Ð¸ Ð¿Ð¾Ð²'Ñ?Ð·Ð°Ð½Ð¾ Ð· Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ñ? Ð² TorÑ?, Ñ?Ð½Ñ?Ð¾Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¾Ñ? Ð½Ð° Ð²Ð°Ñ?Ñ?Ð¹ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?, Ð°Ð±Ð¾ Ð½ÐµÑ?Ð¿Ñ?Ð°Ð²Ð½Ð¸Ð¼ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ?Ð¼. Ð?Ð¾ÐºÐ¸ Ð²Ð¸ Ð½Ðµ Ð¿ÐµÑ?ÐµÐ²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ðµ Tor, Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Tor Ð±Ñ?Ð´Ðµ Ð½Ðµ Ð² Ð·Ð¼Ð¾Ð·Ñ? Ð´Ð¾Ñ?Ñ?Ð³Ñ?Ð¸ Ð±Ñ?Ð´Ñ?-Ñ?ÐºÐ¸Ñ? Ð²ÐµÐ±-Ñ?Ð°Ð¹Ñ?Ñ?Ð². Ð¯ÐºÑ?Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ð½Ðµ Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ñ?Ñ?, Ñ?Ð¾, Ð±Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ñ?Ðµ ÐºÐ¾Ð¿Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ñ? Tor Ñ? Ñ?Ð»Ñ?Ð¶Ð±Ñ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼ÐºÐ¸.
+torlauncher.tor_exited2=Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ðº Tor Ð½Ðµ Ð±Ñ?Ð´Ðµ Ð·Ð°ÐºÑ?Ð¸Ð²Ð°Ñ?Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Ð²Ð°Ñ?Ð¾Ð³Ð¾ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð°.
 torlauncher.tor_controlconn_failed=Ð?ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·'Ñ?Ð´Ð½Ð°Ñ?Ð¸Ñ?Ñ? Ð· Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼ Ñ?Ð¿Ñ?Ð°Ð²Ð»Ñ?Ð½Ð½Ñ? Tor.
 torlauncher.tor_failed_to_start=Tor Ð½Ðµ Ð·Ð¼Ñ?Ð³ Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ð¸Ñ?Ñ?.
 torlauncher.tor_control_failed=Ð?Ð±Ñ?Ð¹ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ñ? Ð½Ð°Ð´ Tor.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=Ð?ÐµÐ¼Ð°Ñ? Ð¼ÐµÑ?ÐµÐ¶ÐµÐ²Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?
 torlauncher.recommended_bridge=(Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)
 
 torlauncher.connect=Ð?'Ñ?Ð´Ð½Ð°Ñ?Ð¸Ñ?Ñ?
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ð¸ Tor
 torlauncher.quit=Ð?Ð¸Ð¹Ñ?Ð¸
 torlauncher.quit_win=Ð?Ð¸Ñ?Ñ?Ð´
 torlauncher.done=Ð?Ð¾Ñ?Ð¾Ð²Ð¾
 
 torlauncher.forAssistance=Ð?Ð»Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸ Ð·Ð²'Ñ?Ð¶Ñ?Ñ?Ñ?Ñ?Ñ? Ð· %S
 
+torlauncher.copiedNLogMessages=Ð?Ð¾Ð¿Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð·Ð°Ð²ÐµÑ?Ñ?ÐµÐ½Ð¾. %S Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ñ? tor Ð³Ð¾Ñ?Ð¾Ð²Ñ? Ð´Ð¾ Ð²Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ñ? Ñ?ÐµÐºÑ?Ñ?Ð¾Ð²Ð¸Ð¹ Ñ?ÐµÐ´Ð°ÐºÑ?Ð¾Ñ? Ð°Ð±Ð¾ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ? ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸.
+
 torlauncher.bootstrapStatus.conn_dir=Ð?'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ð· Ð´Ð¾Ð²Ñ?Ð´Ð½Ð¸ÐºÐ¾Ð¼ Ð¼Ð°Ñ?Ñ?Ñ?Ñ?Ñ?Ð¸Ð·Ð°Ñ?Ð¾Ñ?Ð°
 torlauncher.bootstrapStatus.handshake_dir=Ð?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ? Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ð´Ð¾ ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ñ?
 torlauncher.bootstrapStatus.requesting_status=Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ñ?Ñ?Ð°Ð½Ñ? Ð¼ÐµÑ?ÐµÐ¶Ñ?
diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd
index a3e772f..605bc6f 100644
--- a/src/chrome/locale/ur-PK/network-settings.dtd
+++ b/src/chrome/locale/ur-PK/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Ù?Û?Û?Úº">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties
index b4ba9ca..8ac7270 100644
--- a/src/chrome/locale/ur-PK/torlauncher.properties
+++ b/src/chrome/locale/ur-PK/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Ú?Ú¾Ù?Ú?Ø¯Û?Ø¬Û?Û? (Quit)
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ur/torlauncher.properties
+++ b/src/chrome/locale/ur/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd
index 78f7a1b..c5c0d61 100644
--- a/src/chrome/locale/uz/network-settings.dtd
+++ b/src/chrome/locale/uz/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "Yo'q">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties
index 57dcb32..9ead70b 100644
--- a/src/chrome/locale/uz/torlauncher.properties
+++ b/src/chrome/locale/uz/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Ulanish
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Chiqish
 torlauncher.quit_win=Chiqish
 torlauncher.done=Bajarildi
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/ve/network-settings.dtd
+++ b/src/chrome/locale/ve/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/ve/torlauncher.properties
+++ b/src/chrome/locale/ve/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index 00b0a0f..8450fa3 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "KhÃ´ng">
 
 <!ENTITY torSettings.firstQuestion "Nhá»¯ng má»¥c nÃ y cÃ³ miÃªu táº£ Ä?Ãºng vá»? trÃ cá»§a báº¡n khÃ´ng?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "TÃ´i cáº§n pháº£i cáº¥u hÃ¬nh cáº§u ná»?i, tÆ°á»?ng lá»a, hoáº·c thiáº¿t láºp mÃ¡y chá»§ uá»· quyá»?n.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Cáº¥u hÃ¬nh">
 <!ENTITY torSettings.connectPrompt2 "TÃ´i muá»?n káº¿t ná»?i trá»±c tiáº¿p Ä?áº¿n máº¡ng Tor,">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "Náº¿u nhÆ° báº¡n khÃ´ng cháº¯c cháº¯n lÃ m tháº¿ nÃ o tráº£ lá»?i cÃ¢u há»?i nÃ y, chá»?n KhÃ´ng. Náº¿u nhÆ° báº¡n gáº·p váº¥n Ä?á»? káº¿t ná»?i Ä?áº¿n máº¡ng Tor, thay Ä?á»?i thiáº¿t láºp nÃ y.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "NhÃ  cung cáº¥p dá»?ch vá»¥ (ISP) cá»§a báº¡n cÃ³ ngÄ?n cháº·n hoáº·c kiá»?m duyá»?t káº¿t ná»?i Ä?áº¿n máº¡ng Tor khÃ´ng?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Ä?i qua Web">
 <!ENTITY torsettings.bridgeHelp2 "Sá» dá»¥ng trÃ¬nh duyá»?t web truy cáºp vÃ o https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Gá»i email Ä?áº¿n bridges@xxxxxxxxxxxxxx vá»?i dÃ²ng get bridges trong pháº§n thÃ¢n cá»§a email. Tuy nhiÃªn, Ä?á»? lÃ m cho káº» táº¥n cÃ´ng khÃ³ khÄ?n hÆ¡n trong viá»?c biáº¿t Ä?Æ°á»£c Ä?á»?a chá»? cáº§u ná»?i, báº¡n pháº£i gá»i yÃªu cáº§u nÃ y tá»« email cá»§a yahoo.com hoáº·c gmail.com.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties
index d565c82..4ced031 100644
--- a/src/chrome/locale/vi/torlauncher.properties
+++ b/src/chrome/locale/vi/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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.
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(khuyÃªn dÃ¹ng)
 
 torlauncher.connect=Káº¿t ná»?i
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=ThoÃ¡t
 torlauncher.quit_win=ThoÃ¡t
 torlauncher.done=HoÃ n thÃ nh
 
 torlauncher.forAssistance=Ä?á»? Ä?Æ°á»£c trá»£ giÃºp, liÃªn há»? %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Káº¿t ná»?i vÃ o má»?t thÆ° má»¥c chuyá»?n tiáº¿p 
 torlauncher.bootstrapStatus.handshake_dir=ThÃ nh láºp má»?t káº¿t ná»?i thÆ° má»¥c Ä?Æ°á»£c mÃ£ hÃ³a
 torlauncher.bootstrapStatus.requesting_status=KhÃ´i phá»¥c tráº¡ng thÃ¡i máº¡ng
diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/wa/network-settings.dtd
+++ b/src/chrome/locale/wa/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/wa/torlauncher.properties
+++ b/src/chrome/locale/wa/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/wo/network-settings.dtd
+++ b/src/chrome/locale/wo/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/wo/torlauncher.properties
+++ b/src/chrome/locale/wo/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index db96aef..562cfdb 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "å?¦">
 
 <!ENTITY torSettings.firstQuestion "ä»¥ä¸?å?ªä¸ªæ??è¿°ä¸?ä½ ç??æ??å?µæ??ä¸ºå?¹é??ï¼?">
-<!ENTITY torSettings.configurePrompt1 "è¯¥è®¡ç®?æ?ºç??ç½?ç»?è¿?æ?¥å??å?°å®¡æ?¥æ??è¿?æ»¤ï¼?æ??è??é??è¦?ä½¿ç?¨ä»£ç??ã??">
-<!ENTITY torSettings.configurePrompt2 "æ??é??è¦?é??ç½®ç½?æ¡¥ã??é?²ç?«å¢?æ??è??ä»£ç??è®¾ç½®ã??">
+<!ENTITY torSettings.configurePrompt1 "ç½?ç»?è¿?æ?¥å??å?°å®¡æ?¥æ??é??è¦?ä»£ç??ã??">
+<!ENTITY torSettings.configurePrompt2 "æ??é??è¦?æ·»å? ç½?æ¡¥æ??å¯¹ä»£ç??è®¾å®?è¿?è¡?é??ç½®ã??">
 <!ENTITY torSettings.configure "é??ç½®">
 <!ENTITY torSettings.connectPrompt2 "æ??æ?³è¦?ç?´æ?¥è¿?æ?¥ Tor ç½?ç»?ã??">
 <!ENTITY torSettings.connectPrompt3 "é??å¸¸è¿?ç§?æ?¹å¼?æ?¯æ??æ??ç??ã??">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "å¦?æ??ä¸?ç?¥é??å¦?ä½?å??ç?è¯¥é?®é¢?ï¼?è¯·å?¨å?¶ä»?æµ?è§?å?¨ä¸æ?¥ç??äº?è??ç½?è®¾ç½®ï¼?æ£?æ?¥æ?¯å?¦ä½¿ç?¨äº?ä»£ç??ã??">
 <!ENTITY torSettings.enterProxy "è¾?å?¥ä»£ç??è®¾ç½®ã??">
-<!ENTITY torSettings.firewallQuestion "è¯¥è®¡ç®?æ?ºç??é?²ç?«å¢?æ?¯å?¦ä»?å??è®¸ç?¹å®?ç«¯å?£ç??äº?è??ç½?è¿?æ?¥ï¼?">
-<!ENTITY torSettings.firewallHelp "å¦?æ??ä¸?ç?¥é??å¦?ä½?å??ç?è¯¥é?®é¢?ï¼?è¯·é??æ?©å?¦ã??å¦?æ??è¿?æ?¥ Tor ç½?ç»?æ?¶å?ºç?°é?®é¢?ï¼?è¯·æ?´æ?¹è¯¥è®¾ç½®ã??">
-<!ENTITY torSettings.enterFirewall "è¯·è¾?å?¥é?²ç?«å¢?å??è®¸ç??ç«¯å?£ï¼?ä¸é?´ç?¨é??å?·é??å¼?ã??">
 <!ENTITY torSettings.bridgeQuestion "äº?è??ç½?æ??å?¡æ??ä¾?å??  (ISP)  æ?¯å?¦å¯¹ Tor ç½?ç»?è¿?æ?¥è¿?è¡?äº?å°?é??æ??å®¡æ?¥ï¼?">
 <!ENTITY torSettings.bridgeHelp "å¦?æ??ä¸?ç??è§£è¯¥é?®é¢?ï¼?è¯·é??æ?©â??å?¦â??ã??å¦?æ??é??æ?©â??æ?¯â??ï¼?é?£ä¹?é??è¦?å¯¹ Tor ç½?æ¡¥è¿?è¡?é??ç½®ã??ç½?æ¡¥æ??ç?¨äº?è¿?æ?¥ Tor ç½?ç»?ç??é??å?¬å¼?ç½?ç»?ä¸ç»§ï¼?æ?´é?¾äº?å°?é??ã??">
 <!ENTITY torSettings.bridgeSettingsPrompt "å?¯ä»¥ä½¿ç?¨é??æ??ç??ç½?æ¡¥ï¼?ä¹?å?¯ä»¥è?·å??ç½?æ¡¥ï¼?ä»¥è?ªå®?ä¹?æ?¹å¼?æ??å?¨è¾?å?¥ã??">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "ç½?é¡µæ?¹å¼?">
 <!ENTITY torsettings.bridgeHelp2 "ä½¿ç?¨æµ?è§?å?¨è®¿é?® https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "ç?µå?é?®ä»¶è?ªå?¨å??å¤?æ?¹å¼?">
-<!ENTITY torsettings.bridgeHelp3 "å??é??ç?µå?é?®ä»¶è?³ bridges@xxxxxxxxxxxxxxï¼?å¹¶ä¸?æ£æ??ä¸é??å??å?«â??get bridgesâ?? 2 ä¸ªå??è¯?ï¼?å¦?é??è?·å?? obfs3 ç½?æ¡¥ï¼?è¯·å??â??transport obfs3â??ï¼?ã??ç?±äº?ä¸ºäº?é?²æ¢å°?é??è??è?·å??å¤§é??ç½?æ¡¥å?°å??ï¼?ä½ å¿?é¡»ä½¿ç?¨ gmail.com æ??è?? yahoo.com ç??ç?µå?é?®ä»¶å?°å??å??é??è¿?ä¸?è¯·æ±?ã??">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "å??é??ç?µå?é?®ä»¶è?³ bridges@xxxxxxxxxxxxxxï¼?å¹¶ä¸?æ£æ??ä¸é??å??å?«â??get bridgesâ?? è¿?ä¸¤ä¸ªå??è¯?ï¼?å¦?é??è?·å?? obfs3 ç½?æ¡¥ï¼?è¯·å??â??get transport obfs3â??ï¼?ã??ä¸ºäº?é?²æ¢å°?é??è??å¤§é??è?·å??ç½?æ¡¥å?°å??ï¼?å??é??ç½?æ¡¥è¯·æ±?é?®ä»¶å¿?é¡»ä½¿ç?¨ä»¥ä¸?ç½?ç«?ç??ç?µå?é?®ç®± ï¼?æ??æ?¨è??åº¦ç?±é«?å?°ä½?æ??å??ï¼?ã??">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.netï¼?https://mail.google.com æ??è?? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "è??ç³»å®¢æ??æ?¹å¼?">
-<!ENTITY torsettings.bridgeHelp4 "å¦?æ??ä»¥ä¸?æ?¹å¼?æ? æ³?è?·å??æ??é??ç½?æ¡¥ï¼?ä½?ä¸ºæ??å??ç??ç½?æ¡¥è?·å??æ?¹å¼?ï¼?ä½ å?¯ä»¥å??ä¸?å°?ç¤¼è²?ç??é?®ä»¶å??é??å?° help@xxxxxxxxxxxxxxxxxï¼?ä¸æ??å?¯å??é??è?³ help-zh@xxxxxxxxxxxxxxxxxï¼?ã??è¯·æ³¨æ??ï¼?æ¯?å°?è¿?ç§?é?®ä»¶é?½æ?¯äººå·¥å??åº?ã??">
+<!ENTITY torsettings.bridgeHelp4 "å¦?æ??ä»¥ä¸?æ?¹å¼?æ? æ³?è?·å??æ??é??ç½?æ¡¥ï¼?ä½?ä¸ºæ??å??ç??ç½?æ¡¥è?·å??æ?¹å¼?ï¼?ä½ å?¯ä»¥å??ä¸?å°?ç¤¼è²?ç??é?®ä»¶å??é??å?° help@xxxxxxxxxxxxxxxxxï¼?ä¸æ??å?¯å??é??è?³ help-zh@xxxxxxxxxxxxxxxxxï¼?ã??è¯·æ³¨æ??ï¼?æ?¥ç??å¹¶å??å¤?è¿?äº?é?®ä»¶ç??å¹¶é??æ?ºå?¨äººè??æ?¯æ??æ?¯æ?¯æ??äººå??ã??">
diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd
index c014812..90ef643 100644
--- a/src/chrome/locale/zh-CN/progress.dtd
+++ b/src/chrome/locale/zh-CN/progress.dtd
@@ -1,4 +1,4 @@
 <!ENTITY torprogress.dialog.title "Tor ç?¶æ??">
 <!ENTITY torprogress.openSettings "æ??å¼?è®¾ç½®">
 <!ENTITY torprogress.heading "æ£å?¨è¿?æ?¥ Tor ç½?ç»?">
-<!ENTITY torprogress.pleaseWait "è¯·ç?å¾?å»ºç«?Torç½?ç»?è¿?æ?¥">
+<!ENTITY torprogress.pleaseWait "æ£å?¨è¿?æ?¥ Tor ç½?ç»?ï¼?è¯·ç¨?ç?ã??">
diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties
index cd7ede8..828415a 100644
--- a/src/chrome/locale/zh-CN/torlauncher.properties
+++ b/src/chrome/locale/zh-CN/torlauncher.properties
@@ -1,14 +1,14 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Tor å?¯å?¨å?¨
+torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor æ??å¤?é??å?ºã??
-torlauncher.tor_connection_lost=æ?¨å?° Tor ç½?ç»?ç??è¿?æ?¥å·²ä¸¢å¤±ã??
+torlauncher.tor_exited=Tor æ??å¤?é??å?ºã??è¿?å?¯è?½æ?¯ç?±äº?ï¼?Tor è?ªèº«æ??é??ï¼?æ??ä½?ç³»ç»?ç??å?¶ä»?ç¨?åº?æ??ç¡¬ä»¶æ??é??ã??å?¨é??æ?°å?¯å?¨ Tor ä¹?å??ï¼?Tor Browser å°?æ? æ³?è¿?æ?¥ä»»ä½?ç½?ç«?ã??å¦?æ??é?®é¢?æ??ç»å??ç??ï¼?è¯·å°? Tor æ?¥å¿?å??é??è?³æ??æ?¯å?¢é??ã??
+torlauncher.tor_exited2=é??å?¯ Tor ä¸?ä¼?å?³é?æµ?è§?å?¨æ ?ç¾é¡µã??
 torlauncher.tor_controlconn_failed=æ? æ³?è¿?æ?¥ Tor æ?§å?¶ç«¯å?£ã??
 torlauncher.tor_failed_to_start=Tor æ? æ³?å?¯å?¨ã??
 torlauncher.tor_control_failed=æ?§å?¶ Tor å¤±è´¥ã??
-torlauncher.tor_bootstrap_failed=Tor å»ºç«?å?° Tor ç½?ç»?ç??è¿?æ?¥å¤±è´¥ã??
+torlauncher.tor_bootstrap_failed=è¿?æ?¥ Tor ç½?ç»?å¤±è´¥ã??
 torlauncher.tor_bootstrap_failed_details=%1$S å¤±è´¥ (%2$S)ã??
 
 torlauncher.unable_to_start_tor=æ? æ³?å?¯å?¨ Torã??\n\n%S
@@ -24,24 +24,26 @@ torlauncher.ensure_tor_is_running=è¯·ç¡®ä¿? Tor æ£å?¨è¿?è¡?ã??
 torlauncher.error_proxy_addr_missing=ä¸ºäº?å°? Tor é??ç½®ä¸ºä½¿ç?¨ä»£ç??è®¿é?®äº?è??ç½?ï¼?å¿?é¡»æ??å®? IP å?°å??æ??ä¸»æ?ºå??ä»¥å??ç«¯å?£å?·ã??
 torlauncher.error_proxy_type_missing=å¿?é¡»é??æ?©ä»£ç??ç±»å??ã??
 torlauncher.error_bridges_missing=å¿?é¡»æ??å®?ä¸?ä¸ªæ??å¤?ä¸ªç½?æ¡¥ã??
-torlauncher.error_default_bridges_type_missing=æ?¨å¿?é¡»å¯¹æ??ä¾?ç??ç½?æ¡¥é??æ?©ä¼ è¾?ç±»å??ã??
-torlauncher.error_bridge_bad_default_type=æ²¡æ??æ??ä¾?ä¼ è¾?ç±»å??ä¸º %S ç??å?¯ç?¨ç½?æ¡¥ã??è¯·è°?æ?´ä½ ç??è®¾ç½®ã??
+torlauncher.error_default_bridges_type_missing=å¿?é¡»æ??å®?ç½?æ¡¥ç??ä¼ è¾?ç±»å??ã??
+torlauncher.error_bridge_bad_default_type=æ²¡æ??ä¼ è¾?ç±»å??ä¸º %S ç??å?¯ç?¨ç½?æ¡¥ã??è¯·è°?æ?´è®¾ç½®ã??
 
 torlauncher.recommended_bridge=(æ?¨è??)
 
 torlauncher.connect=è¿?æ?¥
-torlauncher.reconnect=é??æ?°è¿?æ?¥
+torlauncher.restart_tor=é??æ?°å?¯å?¨ Tor
 torlauncher.quit=é??å?º
 torlauncher.quit_win=å?³é?
 torlauncher.done=å®?æ??
 
 torlauncher.forAssistance=å¦?é??å¸®å?©ï¼?è¯·è??ç³» %S
 
+torlauncher.copiedNLogMessages=å¤?å?¶å®?æ??ã??%S æ?¡ Tor æ?¥å¿?ä¿¡æ?¯å·²å??å¤?å¥½ï¼?å?¯ä»¥å°?å?¶ç²?è´´å?°æ??æ?¬ç¼?è¾?å?¨æ??ç?µå?é?®ä»¶ä¸ã??
+
 torlauncher.bootstrapStatus.conn_dir=æ£å?¨è¿?æ?¥ä¸ç»§ç?®å½?
 torlauncher.bootstrapStatus.handshake_dir=æ£å?¨å»ºç«?å? å¯?ç??ç?®å½?è¿?æ?¥
-torlauncher.bootstrapStatus.requesting_status=æ£å?¨æ?¥æ?¶ç½?ç»?ç?¶æ??
+torlauncher.bootstrapStatus.requesting_status=æ£å?¨æ£?ç´¢ç½?ç»?ç?¶æ??
 torlauncher.bootstrapStatus.loading_status=æ£å?¨è½½å?¥ç½?ç»?ç?¶æ??
-torlauncher.bootstrapStatus.loading_keys=æ£å?¨è½½å?¥æ??å¨?è¯?ä¹¦
+torlauncher.bootstrapStatus.loading_keys=æ£å?¨è½½å?¥è¯?ä¹¦é¢?å??æ?ºæ??è¯?ä¹¦
 torlauncher.bootstrapStatus.requesting_descriptors=æ£å?¨è¯·æ±?ä¸ç»§ä¿¡æ?¯
 torlauncher.bootstrapStatus.loading_descriptors=æ£å?¨è½½å?¥ä¸ç»§ä¿¡æ?¯
 torlauncher.bootstrapStatus.conn_or=æ£å?¨è¿?æ?¥ Tor ç½?ç»?
@@ -52,7 +54,7 @@ torlauncher.bootstrapWarning.done=å®?æ??
 torlauncher.bootstrapWarning.connectrefused=è¿?æ?¥è¢«æ??ç»?
 torlauncher.bootstrapWarning.misc=æ??é¡¹
 torlauncher.bootstrapWarning.resourcelimit=èµ?æº?ä¸?å¤?
-torlauncher.bootstrapWarning.identity=èº«ä»½ä¸?ä¸?è?´
+torlauncher.bootstrapWarning.identity=æ ?è¯?ä¸?ä¸?è?´
 torlauncher.bootstrapWarning.timeout=è¿?æ?¥è¶?æ?¶
 torlauncher.bootstrapWarning.noroute=æ²¡æ??å?¯ç?¨é?¾è·¯
 torlauncher.bootstrapWarning.ioerror=è¯»å??é??è¯¯
diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd
index 511ba2f..9a1108c 100644
--- a/src/chrome/locale/zh-HK/network-settings.dtd
+++ b/src/chrome/locale/zh-HK/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "å?¦">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties
index 71d997d..151dc4b 100644
--- a/src/chrome/locale/zh-HK/torlauncher.properties
+++ b/src/chrome/locale/zh-HK/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Torå??å??å?¨
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(å»ºè°)
 
 torlauncher.connect=é?£æ?¥
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=é?¢é??
 torlauncher.quit_win=é?¢é??
 torlauncher.done=å®?æ??
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index e1af290..05427fa 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "å?¦">
 
 <!ENTITY torSettings.firstQuestion "ä¸?å??å?ªä¸?é ?æ??ç¬¦å??æ?¨ç??æ??æ³??">
-<!ENTITY torSettings.configurePrompt1 "é??å?°é?»è?¦ç??ç¶²é??ç¶²è·¯é?£ç·?é?å¯©æ?¥ã??é??æ¿¾ã??æ??ç¶?é??ä»£ç??ã??">
-<!ENTITY torSettings.configurePrompt2 "æ??é??è¦?è¨å®?æ©?æ?¥ã??é?²ç?«ç??æ??ä»£ç??ä¼ºæ??å?¨è¨å®?ã??">
+<!ENTITY torSettings.configurePrompt1 "é??é?¨é?»è?¦ç??ç¶²è·¯é?£ç·?æ?¯è¢«å¯©æ?¥æ??æ?¯æ??ä»£ç??ç??ã??">
+<!ENTITY torSettings.configurePrompt2 "æ??é??è¦?é??ç½®æ©?æ?¥æ??ä»£ç??è¨å®?ã??">
 <!ENTITY torSettings.configure "è¨å®?">
 <!ENTITY torSettings.connectPrompt2 "æ??æ?³ç?´æ?¥é?£æ?¥å?° Tor ç¶²è·¯ã??">
 <!ENTITY torSettings.connectPrompt3 "é??å°?å?¨å¤§å¤?æ?¸æ??æ³?ä¸?ç??æ??ã??">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "è?¥æ?¨ä¸?ç¢ºå®?å¦?ä½?å??ç?æ¤å??é¡?ï¼?è«?æ?¥ç??å?¶ä»?ç??è¦½å?¨ç??ç¶²é??ç¶²è·¯è¨å®?ï¼?ç??ç??å®?æ?¯å?¦è¨å®?æ??ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨é?£ç·?ã??">
 <!ENTITY torSettings.enterProxy "è¼¸å?¥ä»£ç??ä¼ºæ??å?¨è¨å®?ã??">
-<!ENTITY torSettings.firewallQuestion "é??å?°é?»è?¦ç??ç¶²é??ç¶²è·¯é?£ç·?ï¼?è¦?é??é??å?ªå??è¨±é?£æ?¥ç?¹å®?é?£ç·?å? ç??é?²ç?«ç??å???">
-<!ENTITY torSettings.firewallHelp "è?¥æ?¨ä¸?ç¢ºå®?å¦?ä½?å??ç?æ¤å??é¡?ï¼?è«?é?¸æ??ã??å?¦ã??ã??è?¥æ?¨é?£æ?¥è?³ Tor ç¶²è·¯æ??é?é??å??é¡?ï¼?è«?è®?æ?´æ¤è¨å®?ã??">
-<!ENTITY torSettings.enterFirewall "è«?è¼¸å?¥é?²ç?«ç??å??è¨±ç??é?£ç·?å? ï¼?è«?ä»¥é??è??å??é??ï¼?ã??">
 <!ENTITY torSettings.bridgeQuestion "æ?¨ç??ç¶²é??ç¶²è·¯æ??å??æ??ä¾?è??(ISP)é?»æ??æ??å¯©æ?¥å?¡é?£æ?¥å?° Tor ç¶²è·¯?">
 <!ENTITY torSettings.bridgeHelp "å¦?æ??æ?¨ä¸?ç¢ºå®?å¦?ä½?å??ç?æ¤å??é¡?ï¼?è«?é?¸æ??ã??å?¦ã??ã??&#160; å¦?æ??æ?¨é?¸æ??ã??æ?¯ã??ï¼?æ?¨å°?è¢«è¦?æ±?è¨å®?Tor æ©?æ?¥ï¼?é??è®?é?»æ¢é?£æ?¥å?° Tor ç¶²è·¯æ?´å? å?°é?£ã??">
 <!ENTITY torSettings.bridgeSettingsPrompt "æ?¨å?¯ä»¥ä½¿ç?¨æ??ä¾?ç??æ©?æ?¥æ??æ?¨å?¯ä»¥è¼¸å?¥ä¸?çµ?è?ªè¨?ç??æ©?æ?¥ã??">
@@ -54,11 +51,12 @@
 
 <!ENTITY torsettings.copyLog "å°? Tor è¨?é??è¤?è£½å?°å?ªè²¼ç°¿">
 <!ENTITY torsettings.bridgeHelpTitle "æ©?æ?¥ä¸ç¹¼èªªæ??">
-<!ENTITY torsettings.bridgeHelp1 "è?¥æ?¨ç?¡æ³?é?£æ?¥å?° Tor ç¶²è·¯ï¼?å?¯è?½æ?¯æ?¨ç??ç¶²é??ç¶²è·¯æ??å??æ??ä¾?è?? (ISP) æ??å?¶ä»?æ©?æ§?å·²å°?é?? Torã??&#160; é??å¸¸æ?¨å?¯ä»¥ä½¿ç?¨æ?´é?£ä»¥å°?é??ä¹?é?±è??ä¸ç¹¼ç?? Tor æ©?æ?¥ä¾?è§£æ±ºæ¤å??é¡?ã??">
+<!ENTITY torsettings.bridgeHelp1 "è?¥æ?¨ç?¡æ³?é?£æ?¥å?° Tor ç¶²è·¯ï¼?å?¯è?½æ?¯æ?¨ç??ç¶²é??ç¶²è·¯æ??å??æ??ä¾?è?? (ISP) æ??å?¶å®?æ©?æ§?å·²å°?é?? Torã??&#160; é??å¸¸æ?¨å?¯ä»¥ä½¿ç?¨æ?´é?£ä»¥å°?é??ä¹?é?±è??ä¸ç¹¼ç?? Tor æ©?æ?¥ä¾?è§£æ±ºæ¤å??é¡?ã??">
 <!ENTITY torsettings.bridgeHelp1B "æ?¨å?¯ä»¥ä½¿ç?¨é ?å??è¨å®?ï¼?æ??ä¾?æ©?æ?¥ä½?å??æ??æ?¨å?¯ä»¥ä½¿ç?¨ä¸?å??ä¸?ç¨®æ?¹æ³?å?¶ä¸ä¹?ä¸?ç?²å??ä¸?çµ?è?ªè¨?ç??ä½?å??:">
 <!ENTITY torsettings.bridgeHelp2Heading "é??é??ç¶²è·¯">
 <!ENTITY torsettings.bridgeHelp2 "ä½¿ç?¨ç¶²è·¯ç??è¦½å?¨é? è¨ª https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "é??é??é?»å?é?µä»¶è?ªå??å??è¦?">
-<!ENTITY torsettings.bridgeHelp3 "å°?æ?¾å?¬ç?¾æ©?æ?¥ä½?å??ç??å?¦ä¸?ç¨®æ?¹å¼?æ?¯ç?¼é??é?»å?é?µä»¶å?° bridges@xxxxxxxxxxxxxxï¼?ä¸¦å?¨å?§æ??ä¸å??å?« ã??get bridgesã??è¨?æ?¯ã??&#160; ç?¶è??ï¼?ç?ºäº?ä½¿æ?»æ??è??æ?´é?£è¨?é??å?°æ?´å¤?æ©?æ?¥ä½?å??ï¼?æ?¨å¿?é ?ä½¿ç?¨ gmail.com æ?? yahoo.com ç??ä¿¡ç®±ä¾?ç?¼é??æ¤é?µä»¶ã??">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "å?³é??é?µä»¶å?° bridges@xxxxxxxxxxxxxx ä¸¦å?¨å?§æ??ä¸è¼¸å?¥ 'get bridges'ã??&#160; ç?¶è??ï¼?è¦?ä½¿å¾?é§å®¢æ?´é?£å¸ç¿?æ??é??æ©?æ?¥ä½?å??ï¼?æ?¨å¿?é ?æ?¯ä½¿ç?¨ä»¥ä¸?é?»å?é?µä»¶æ??ä¾?è??ä¹?ä¸?ä¾?å¯?é??æ?¬è¦?æ±? (å??è¡¨é ?åº?æ?¯ä¾?ç?§å?ªå??å??å¥½)ï¼?">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, æ??è?? https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "é??é??æ??å??å?°">
-<!ENTITY torsettings.bridgeHelp4 "æ??å¾?ç??æ?¹æ³?æ?¯:æ?¨å?¯ä»¥ç?¼é??ä¸?å°?æ£å¸¸ç??é?µä»¶å?° help@xxxxxxxxxxxxxxxxxã??&#160; è«?æ³¨æ??æ??å??é??è¦?ä¸?å°?å°?ç??æ??å??å??è¦?é?µä»¶ã??">
+<!ENTITY torsettings.bridgeHelp4 "æ??å¾?ç??æ?¹æ³?æ?¯:æ?¨å?¯ä»¥ç?¼é??ä¸?å°?æ£å¸¸ç??é?µä»¶å?° help@xxxxxxxxxxxxxxxxxã??&#160; è«?æ³¨æ??æ??å??é??è¦?ä¸?å°?å°?å?°æ??å??å??è¦?é?µä»¶ã??">
diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties
index 78d59a3..ed3f796 100644
--- a/src/chrome/locale/zh-TW/torlauncher.properties
+++ b/src/chrome/locale/zh-TW/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor å??å??å·¥å?·
 
-torlauncher.tor_exited=Tor æ??å¤?çµ?æ??ã??
-torlauncher.tor_connection_lost=æ?¨è?? Tor ç¶²è·¯ç??é?£ç·?å·²é?ºå¤±ã??
+torlauncher.tor_exited=Tor æ??å¤?å?°çµ?æ??ã??é??æ??å?¯è?½æ?¯ Tor æ?¬èº«ç??ç¨?å¼?é?¯èª¤ã??æ?¨ç³»çµ±ä¸?ç??å?¶å®?ç¨?å¼?æ??æ?¯ç¡¬é«?æ??é??ã??ç?´å?°æ?¨é??æ?°å??å?? Torï¼?Tor Browserå°?ä¸?æ??é? è¨ªä»»ä½?ç¶²ç«?ã??å¦?æ??å??é¡?ä»?ç?¶å?å?¨ï¼?è«?ç?¼é??æ?¨ç?? Tor ç´?é??å?¯æ?¬å?°æ?¯æ?´å??é??ã??
+torlauncher.tor_exited2=é??æ?°å??å?? Tor å°?ä¸?æ??é??é??æ?¨ç??è¦½å?¨ç??å??é ?ã??
 torlauncher.tor_controlconn_failed=ç?¡æ³?é?£æ?¥è?³ Tor æ?§å?¶é?£æ?¥å? ã??
 torlauncher.tor_failed_to_start=Tor ç?¡æ³?å??å??ã??
 torlauncher.tor_control_failed=ç?¡æ³?æ?§å?¶ Torã??
@@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=æ²?æ??å?¯ç?¨ç??å?³è¼¸é¡?å??ç?º %S ç??
 torlauncher.recommended_bridge=(å»ºè°ä½¿ç?¨)
 
 torlauncher.connect=é?£æ?¥
-torlauncher.reconnect=é??æ?°é?£ç·?
+torlauncher.restart_tor=é??æ?°å??å?? Tor
 torlauncher.quit=é?¢é??
 torlauncher.quit_win=çµ?æ??
 torlauncher.done=å®?æ??
 
 torlauncher.forAssistance=å¦?é??å??å?©ï¼?è«?è?¯çµ¡ %S
 
+torlauncher.copiedNLogMessages=è¤?è£½å®?æ??ã??%S Tor ç´?é??è¨?æ?¯å·²æº?å??å¥½è¢«è²¼å?°æ??å?ç·¨è¼¯å?¨æ??æ?¯ä¸?å°?é?»å?é?µä»¶è¨?æ?¯ã??
+
 torlauncher.bootstrapStatus.conn_dir=æ£é?£æ?¥è?³ä¸ç¹¼ç?®é??
 torlauncher.bootstrapStatus.handshake_dir=æ£å?¨å»ºç«?å? å¯?ç??ç?®é??é?£ç·?
 torlauncher.bootstrapStatus.requesting_status=æ£å?¨æ?·å??ç¶²è·¯ç??æ??
diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd
index f46473e..3661088 100644
--- a/src/chrome/locale/zu/network-settings.dtd
+++ b/src/chrome/locale/zu/network-settings.dtd
@@ -8,8 +8,8 @@
 <!ENTITY torSettings.no "No">
 
 <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?">
-<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">
-<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings.">
+<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">
+<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings.">
 <!ENTITY torSettings.configure "Configure">
 <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network.">
 <!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
@@ -19,9 +19,6 @@
 <!-- see https://www.torproject.org/docs/proxychain.html.en -->
 <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy.">
 <!ENTITY torSettings.enterProxy "Enter the proxy settings.">
-<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
-<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
-<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
 <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
 <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
 <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
@@ -59,6 +56,7 @@
 <!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
 <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org";>
 <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
-<!ENTITY torsettings.bridgeHelp3 "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address.">
+<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges@xxxxxxxxxxxxxx with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">
+<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com";>
 <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">
 <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help@xxxxxxxxxxxxxxxxxx&#160; Please note that a person will need to respond to each request.">
diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties
index bf2426a..02be756 100644
--- a/src/chrome/locale/zu/torlauncher.properties
+++ b/src/chrome/locale/zu/torlauncher.properties
@@ -3,8 +3,8 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost.
+torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
 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,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran
 torlauncher.recommended_bridge=(recommended)
 
 torlauncher.connect=Connect
-torlauncher.reconnect=Reconnect
+torlauncher.restart_tor=Restart Tor
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
 
 torlauncher.forAssistance=For assistance, contact %S
 
+torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status

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

Prev by Author: [tor-commits] [tor-browser-bundle/master] Bug 12103: Adding RELRO back to browser binaries.
Next by Author: [tor-commits] [tor-launcher/master] Bump version to 0.2.7.0.
Previous by thread: [tor-commits] [tor-launcher/master] Bump version to 0.2.7.0.
Next by thread: [tor-commits] [tor-browser-bundle/master] Update versions file for Torbutton and Tor Launcher.
Index(es):
- Author
- Thread