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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release



commit cfc8e035168ec08c902e45595f1438d51e8618eb
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Wed May 26 09:47:15 2021 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 ach.po    | 236 +++++++++++++++++++++++++++++++++-----------------------
 af.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ar.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ast.po    | 236 +++++++++++++++++++++++++++++++++-----------------------
 az.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 be.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 bg.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 bn.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 br.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 bs.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ca.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 cs.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 cy.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 da.po     | 238 +++++++++++++++++++++++++++++++++-----------------------
 de.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 el.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 en_GB.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 eo.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 es.po     | 258 ++++++++++++++++++++++++++++++++++++-------------------------
 es_AR.po  | 256 ++++++++++++++++++++++++++++++++++++-------------------------
 es_MX.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 et.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 eu.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 fa.po     | 238 +++++++++++++++++++++++++++++++++-----------------------
 fi.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 fr.po     | 260 ++++++++++++++++++++++++++++++++++++--------------------------
 fy.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ga.po     | 238 +++++++++++++++++++++++++++++++++-----------------------
 gd.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 gl.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 gu.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 he.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 hi.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 hr.po     | 238 +++++++++++++++++++++++++++++++++-----------------------
 hu.po     | 238 +++++++++++++++++++++++++++++++++-----------------------
 hy.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ia.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 id.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 is.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 it.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ja.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ka.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 kab.po    | 236 +++++++++++++++++++++++++++++++++-----------------------
 kk.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 km.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 kn.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ko.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 lt.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 lv.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 mk.po     | 238 +++++++++++++++++++++++++++++++++-----------------------
 ml.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 mr.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ms_MY.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 my.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 nb.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ne.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 nl.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 nl_BE.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 nn.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 oc.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 or.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 pa.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 pl.po     | 238 +++++++++++++++++++++++++++++++++-----------------------
 pt_BR.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 pt_PT.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 ro.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ru.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 si.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 si_LK.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 sk.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 sl.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 son.po    | 236 +++++++++++++++++++++++++++++++++-----------------------
 sq.po     | 238 +++++++++++++++++++++++++++++++++-----------------------
 sr.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 sv.po     | 256 ++++++++++++++++++++++++++++++++++++-------------------------
 sw.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ta.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 tails.pot | 236 +++++++++++++++++++++++++++++++++-----------------------
 te.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 th.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 tr.po     | 258 ++++++++++++++++++++++++++++++++++++-------------------------
 uk.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 ur.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 uz.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 vi.po     | 236 +++++++++++++++++++++++++++++++++-----------------------
 zh_CN.po  | 238 +++++++++++++++++++++++++++++++++-----------------------
 zh_HK.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 zh_TW.po  | 236 +++++++++++++++++++++++++++++++++-----------------------
 88 files changed, 12471 insertions(+), 8423 deletions(-)

diff --git a/ach.po b/ach.po
index bd712f0b0c..951dfb14b2 100644
--- a/ach.po
+++ b/ach.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Acoli (http://www.transifex.com/otf/torproject/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/af.po b/af.po
index 9c0b1cea73..eaef3e33f5 100644
--- a/af.po
+++ b/af.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ar.po b/ar.po
index 163a0bd2e0..93eaba656e 100644
--- a/ar.po
+++ b/ar.po
@@ -36,8 +36,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -497,7 +497,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1258,8 +1258,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1275,7 +1274,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "خطأ"
 
@@ -1650,7 +1649,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1738,32 +1737,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1789,16 +1785,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2171,11 +2167,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2545,38 +2547,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2586,53 +2599,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2640,126 +2648,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ast.po b/ast.po
index 6d50ff348b..fdb4e14db2 100644
--- a/ast.po
+++ b/ast.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/az.po b/az.po
index 61593e1b74..e01b104cb7 100644
--- a/az.po
+++ b/az.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1682,32 +1681,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1733,16 +1729,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2115,11 +2111,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2489,38 +2491,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2530,53 +2543,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2584,126 +2592,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/be.po b/be.po
index 5c86a2149c..a2fd2784aa 100644
--- a/be.po
+++ b/be.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -458,7 +458,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1219,8 +1219,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1236,7 +1235,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1607,7 +1606,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1695,32 +1694,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1746,16 +1742,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2128,11 +2124,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2502,38 +2504,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2543,53 +2556,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2597,126 +2605,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/bg.po b/bg.po
index 10650ddb7e..a72d95db6e 100644
--- a/bg.po
+++ b/bg.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -460,7 +460,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1221,8 +1221,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1238,7 +1237,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1605,7 +1604,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1693,32 +1692,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1744,16 +1740,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2126,11 +2122,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2500,38 +2502,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2541,53 +2554,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2595,126 +2603,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/bn.po b/bn.po
index d94e930fc1..abbe49b988 100644
--- a/bn.po
+++ b/bn.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
@@ -452,7 +452,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1213,8 +1213,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1230,7 +1229,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1597,7 +1596,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1685,32 +1684,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1736,16 +1732,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2118,11 +2114,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2492,38 +2494,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2533,53 +2546,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2587,126 +2595,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/br.po b/br.po
index 3f8552683d..beb384309c 100644
--- a/br.po
+++ b/br.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n"
 "MIME-Version: 1.0\n"
@@ -464,7 +464,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1225,8 +1225,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1242,7 +1241,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1615,7 +1614,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1703,32 +1702,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1754,16 +1750,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2136,11 +2132,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2510,38 +2512,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2551,53 +2564,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2605,126 +2613,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/bs.po b/bs.po
index f83e688f0a..e05a97d64d 100644
--- a/bs.po
+++ b/bs.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -453,7 +453,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1214,8 +1214,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1231,7 +1230,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1600,7 +1599,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1688,32 +1687,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1739,16 +1735,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2121,11 +2117,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2495,38 +2497,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2536,53 +2549,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2590,126 +2598,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ca.po b/ca.po
index 96fa8bb6d3..c57ec922c7 100644
--- a/ca.po
+++ b/ca.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -467,7 +467,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -1228,8 +1228,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1245,7 +1244,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Error"
 
@@ -1612,7 +1611,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1700,32 +1699,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1751,16 +1747,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "El Tor no està preparat"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "El Tor no està preparat. Voleu iniciar el navegador Tor igualment?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Inicia el navegador Tor"
 
@@ -2133,11 +2129,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2507,38 +2509,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2548,53 +2561,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2602,126 +2610,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/cs.po b/cs.po
index d667984e15..bcfaf30aef 100644
--- a/cs.po
+++ b/cs.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -477,7 +477,7 @@ msgstr "Další nastavení"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -1238,8 +1238,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1255,7 +1254,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Chyba"
 
@@ -1626,7 +1625,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Nastavte heslo pro odemÄ?ení obrazovky."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Heslo"
 
@@ -1714,32 +1713,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1765,16 +1761,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Síť Tor není pÅ?ipravena"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Síť Tor není pÅ?ipravena. Chcete prohlížeÄ? Tor pÅ?esto spustit?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Spustit prohlížeÄ? Tor"
 
@@ -2147,11 +2143,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2521,38 +2523,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "Kontejner TrueCrypt/VeraCrypt"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2562,53 +2575,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2616,126 +2624,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/cy.po b/cy.po
index 33e1ce532a..ae835e850c 100644
--- a/cy.po
+++ b/cy.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n"
 "MIME-Version: 1.0\n"
@@ -461,7 +461,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1222,8 +1222,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1239,7 +1238,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1610,7 +1609,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1698,32 +1697,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1749,16 +1745,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2131,11 +2127,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2505,38 +2507,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2546,53 +2559,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2600,126 +2608,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/da.po b/da.po
index f4aaa74a1c..0a6aa410f8 100644
--- a/da.po
+++ b/da.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -463,7 +463,7 @@ msgstr "Yderligere indstillinger"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Annuller"
 
@@ -1224,9 +1224,8 @@ msgid "Dotfiles"
 msgstr "Punktumfiler"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Symlink alle filer eller mapper fra \"dotfiles\"-mappen ind i $HOME"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1241,7 +1240,7 @@ msgstr "Opsæt vedvarende diskområde i Tails"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Fejl"
 
@@ -1608,7 +1607,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Opsæt en adgangskode til at låse op for skærmen."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -1696,32 +1695,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1747,16 +1743,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor er ikke klar"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor er ikke klar. Start Tor Browser alligevel?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Start Tor Browser"
 
@@ -2129,11 +2125,17 @@ msgstr "Kontaktens OpenPGP-nøgle er ugyldig: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Kontaktens offentlig nøgle-blok for OpenPGP er ugyldig"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2503,38 +2505,49 @@ msgstr "Send"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "TrueCrypt-/VeraCrypt-beholder"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2544,53 +2557,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2598,126 +2606,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/de.po b/de.po
index 5e3d39d66c..c69a197144 100644
--- a/de.po
+++ b/de.po
@@ -39,8 +39,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -480,7 +480,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1241,8 +1241,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1258,7 +1257,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Fehler"
 
@@ -1625,7 +1624,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Passwort"
 
@@ -1713,32 +1712,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1764,16 +1760,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor ist nicht bereit"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor ist nicht bereit. Möchten Sie den Tor-Browser trotzdem starten?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Tor-Browser starten"
 
@@ -2146,11 +2142,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2520,38 +2522,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2561,53 +2574,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2615,126 +2623,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/el.po b/el.po
index 99e69772df..539fff1cdb 100644
--- a/el.po
+++ b/el.po
@@ -30,8 +30,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -471,7 +471,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1232,8 +1232,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1249,7 +1248,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1616,7 +1615,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1704,32 +1703,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1755,16 +1751,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2137,11 +2133,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2511,38 +2513,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2552,53 +2565,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2606,126 +2614,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/en_GB.po b/en_GB.po
index 65af34615a..0d252af75e 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -452,7 +452,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1213,8 +1213,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1230,7 +1229,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1597,7 +1596,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1685,32 +1684,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1736,16 +1732,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2118,11 +2114,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2492,38 +2494,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2533,53 +2546,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2587,126 +2595,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/eo.po b/eo.po
index ca268e4e41..b1559c01c9 100644
--- a/eo.po
+++ b/eo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1682,32 +1681,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1733,16 +1729,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2115,11 +2111,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2489,38 +2491,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2530,53 +2543,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2584,126 +2592,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/es.po b/es.po
index df00ceb48b..acfd57237b 100644
--- a/es.po
+++ b/es.po
@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 14:54+0000\n"
-"Last-Translator: eulalio barbero espinosa <eulaliob@xxxxxxxxx>\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -461,7 +461,7 @@ msgstr "Configuración adicional"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1222,9 +1222,8 @@ msgid "Dotfiles"
 msgstr "Dotfiles (formato de '.ficheros' de configuración)"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Crear enlaces simbólicos ('symlink') en $HOME para todos los ficheros o carpetas en la carpeta 'dotfiles' (formato de '.ficheros' de configuración)"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1239,7 +1238,7 @@ msgstr "Configurar el volumen persistente de Tails"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Error"
 
@@ -1606,7 +1605,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Establece una contraseña para desbloquear la pantalla"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Contraseña"
 
@@ -1694,32 +1693,29 @@ msgstr "Más información"
 msgid "Tor Connection"
 msgstr "Conexión Tor"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr "No es válido: {exception}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr "Necesitas configurar un puente obfs4 para ocultar que estás usando Tor"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr "Conectando a Tor sin puentes..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
-msgstr "Conectando con puentes por defecto..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
-msgstr "Conectando con puentes personalizados..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr "Conectando a Tor con puentes por defecto..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1745,16 +1741,16 @@ msgstr "_Abrir instrucciones de migración"
 msgid "_Migrate Later"
 msgstr "_Migrar más tarde"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor no está listo"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor no está listo. ¿Iniciar el Tor Browser de todos modos?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Iniciar Tor Browser"
 
@@ -2127,11 +2123,17 @@ msgstr "Clave OpenPGP de contacto no válida: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Bloque de clave pública OpenPGP de contacto no válida"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2501,38 +2503,49 @@ msgstr "Enviar"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "Contenedor TrueCrypt/VeraCrypt"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr "Configura un puente de Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr "Los puentes son repetidores secretos de Tor. Utiliza un puente como tu primer repetidor Tor si el acceso a Tor está bloqueado desde donde te encuentras."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr "Usa un puente por defecto"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr "obfs4 (recomendado)"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr "meek"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr "Ninguno"
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr "Solicita un puente nuevo"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr "Escribe un puente que ya conoces"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2542,53 +2555,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr "Actualmente en Tails, sólo los puentes obfs4 ocultan que estás usando Tor.\n\nLos puentes obfs4 comienzan con la palabra 'obfs4'.\n\nPara solicitar puentes obfs4, puedes enviar un correo electrónico vacío a\n<tt>bridges@xxxxxxxxxxxxxx</tt>  desde una dirección de correo electrónico de Gmail o Riseup.\n"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr "Ninguno"
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr "Conecta a_Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr "Error de conexión a Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr "� Red pública"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr "Si estás en una tienda, un hotel o un aeropuerto, a lo mejor tienes que que conectarte a la red."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr "Intenta conectarte a la red"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr "â?¢ Proxy local"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr "Si estás en una red corporativa o universitaria, puede que necesites configurar un proxy."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr "Configurar un _Proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr "� Puentes por correo electrónico"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2596,126 +2604,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr "Para solicitar puentes Tor, también puedes:\n\n1. enviar un correo vacío a <tt>bridges@xxxxxxxxxxxxxx</tt> desde una dirección de correo de Gmail o Riseup.\n2. Escribir puentes haciendo clic en el botón <i>Configurar un Puente</i>"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr "Configurar un P_uente"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr "Todo lo que hagas en Internet desde Tails va a través de la red Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr "Tor encripta y anonimiza tu conexión pasándola a través de 3 repetidores.\nLos repetidores de Tor son servidores operados por diferentes organizaciones y voluntarios de todo el mundo."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
-msgstr "<b>Configurar Tor automáticamente (más fácil)</b>\n\nRecomendamos configurar Tor automáticamente si:\n � Te conectas desde una Wi-Fi pública.\n � La conexión a Tor puede estar bloqueada en tu país pero el uso de Tor no está penalizado."
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
+msgid ""
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
-msgstr "<b>Ocultar a mi red local que estoy usando Tor (más seguro)</b>\n\nPuede que necesites pasar desapercibido si:\n - El uso de Tor podría parecer sospechoso a alguien que monitorice tu red doméstica o de trabajo.\n - El uso de Tor está penalizado en tu país."
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
+"\n"
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr "Has perdido conexión de la red local."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
-msgstr "Probando el acceso a Internet..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr "Tienes acceso a Internet"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
-msgstr "Probando acceso a la red Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr "Puedes conectar a Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr "Fallo en la conexión a Tor sin puentes."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr "Tu red local está bloqueando el acceso a Tor."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
-msgstr "Conectando a Tor"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
-msgstr "Conectado a Tor con éxito\n\nYa puedes navegar por Internet de forma anónima y sin censura"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr "Abrir el monitor de red"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr "Ver los circuitos de Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr "Restablecer la conexión Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr "Tipo de proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr "Dirección"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr "Dirección IP o nombre de máquina (host)"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr "Puerto"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr "_Guardar la configuración del proxy"
diff --git a/es_AR.po b/es_AR.po
index 3082289bf4..df6a2e49f8 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -457,7 +457,7 @@ msgstr "Configuraciones Adicionales"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1218,9 +1218,8 @@ msgid "Dotfiles"
 msgstr "Archivos ocultos"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Crear vínculos simbólicos en $HOME de todos los archivos o directorios encontrados en el directorio `archivos_ocultos'"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1235,7 +1234,7 @@ msgstr "Configurar volumen persistente de Tails"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Error"
 
@@ -1602,7 +1601,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Definí una contraseña para desbloquear la pantalla."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Contraseña"
 
@@ -1690,32 +1689,29 @@ msgstr "Aprendé más"
 msgid "Tor Connection"
 msgstr "Conexión a Tor"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr "Inválida: {exception}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr "Necesitás configurar un puente obfs4 para ocultar que estás usando Tor"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr "Conectando a Tor sin puentes..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
-msgstr "Conectando con puentes predeterminados..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
-msgstr "Conectando con puentes personalizados..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr "Conectando a Tor con puentes predeterminados..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1741,16 +1737,16 @@ msgstr "_Abrir Instrucciones de Migración"
 msgid "_Migrate Later"
 msgstr "_Migrar Luego"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor no está listo"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor no está listo. ¿Iniciar el Navegador Tor de todos modos?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Iniciar el Navegador Tor"
 
@@ -2123,11 +2119,17 @@ msgstr "Clave OpenPGP de contacto inválida: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Bloque de clave pública OpenPGP de contacto inválido"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2497,38 +2499,49 @@ msgstr "Enviar"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "Contenedor TrueCrypt/VeraCrypt"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr "Configurar un puente Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr "Los puentes son repetidores Tor secretos. Usá un puente como tu primer repetidor Tor si el acceso a Tor está bloqueado desde donde estás."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr "Usar un puente predeterminado"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr "obfs4 (recomendado)"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr "meek"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr "Ninguno"
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr "Solicitá un nuevo puente"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr "Tipear un puente que ya conozco"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2538,53 +2551,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr "Actualmente en Tails, solo los puentes obfs4 ocultan tu uso de Tor.\n\nlos puentes obfs4 empiezan con la palabra 'obfs4'.\n\nPara solicitar puentes obfs4, podés enviar un correo electrónico vacío a\n<tt>bridges@xxxxxxxxxxxxxx</tt> desde una dirección electrónica de  Gmail o Riseup.\n"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr "Ninguno"
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr "Conectar a _Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr "Error conectándose a Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr "� Red pública"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr "Si estás en un negocio, hotel o aeropuerto, puede que necesités iniciar sesión dentro de la red."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr "Intenta iniciar sesión dentro de la red"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr "â?¢ Proxy local"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr "Si estás en una red corporativa o universitaria, puede que necesités configurar un proxy."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr "Configurar un _Proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr "� Puentes a través de correo electrónico"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2592,126 +2600,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr "Para solicitar puentes Tor, también podés:\n\n1. enviar un correo electrónico vacío a <tt>bridges@xxxxxxxxxxxxxx</tt> desde una dirección electrónica de Gmail o Riseup.\n2. Tipear puentes cliqueando en el botón <i>Configurar un Puente</i>"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr "Configurar un p_Uente"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr "Todo lo que hacés en Internet desde Tails va a través de la red Tor."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr "Tor encripta y hace anónima tu conexión al pasarla a través de 3 repetidores.\nLos repetidores Tor son servidores operados por diferentes organizaciones y voluntarios alrededor del mundo."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
-msgstr "<b>Configurar Tor automáticamente (más fácil)</b>\n\nRecomendamos configurar Tor automáticamente si:\n � Te estás conectando desde una red pública Wi-Fi.\n � Conectarse a Tor pudiera estar bloqueado en tu país, pero su uso no está criminalizado."
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
+msgid ""
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
-msgstr "<b>Ocultarle a mi red local que estoy usando Tor (más seguro)</b>\n\nPuede que necesites pasar desapercibido si:\n - Usar Tor pudiera parecer sospechoso para alguien que esté monitoreando tu red doméstica o laboral.\n - Usar Tor está criminalizado en tu país."
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
+"\n"
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr "Perdiste la conexión a la red local."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
-msgstr "Probando acceso a Internet..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr "Tenés acceso a Internet"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
-msgstr "Probando acceso a Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr "Podés conectarte a Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr "Fallo al conectar a Tor sin puentes."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr "Tu red local está bloqueando al acceso a Tor."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
-msgstr "Conectándose a Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
-msgstr "Conectado a Tor exitosamenrte\n\nAhora podés navegar Internet anónimamente y sin censura"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr "Abrir monitor de red"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr "Ver circuitos Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr "Restablecer conexión a Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr "Tipo de proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr "Dirección"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr "Dirección IP o nombre de equipo"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr "Puerto"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr "_Guardar los ajustes del proxy"
diff --git a/es_MX.po b/es_MX.po
index 3ec1132227..872920036a 100644
--- a/es_MX.po
+++ b/es_MX.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -450,7 +450,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1211,8 +1211,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1228,7 +1227,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1595,7 +1594,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1683,32 +1682,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1734,16 +1730,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2116,11 +2112,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2490,38 +2492,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2531,53 +2544,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2585,126 +2593,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/et.po b/et.po
index aa0ab510b7..8b831a31f5 100644
--- a/et.po
+++ b/et.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -452,7 +452,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1213,8 +1213,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1230,7 +1229,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1597,7 +1596,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1685,32 +1684,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1736,16 +1732,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2118,11 +2114,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2492,38 +2494,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2533,53 +2546,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2587,126 +2595,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/eu.po b/eu.po
index d855dd3231..43a57bc2f2 100644
--- a/eu.po
+++ b/eu.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -455,7 +455,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1216,8 +1216,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1233,7 +1232,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1600,7 +1599,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1688,32 +1687,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1739,16 +1735,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2121,11 +2117,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2495,38 +2497,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2536,53 +2549,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2590,126 +2598,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/fa.po b/fa.po
index 1a4d4c2b06..35936a9636 100644
--- a/fa.po
+++ b/fa.po
@@ -36,9 +36,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 15:46+0000\n"
-"Last-Translator: Reza Ghasemi\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -477,7 +477,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1238,8 +1238,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1255,7 +1254,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1622,7 +1621,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1710,32 +1709,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1761,16 +1757,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2143,11 +2139,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2517,38 +2519,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2558,53 +2571,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2612,126 +2620,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/fi.po b/fi.po
index b3f8184b7a..c092d6cae6 100644
--- a/fi.po
+++ b/fi.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -462,7 +462,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -1223,8 +1223,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1240,7 +1239,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Virhe"
 
@@ -1607,7 +1606,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1695,32 +1694,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1746,16 +1742,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor ei ole valmis"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor ei ole valmis. Käynnistetäänkö Tor-selain siitä huolimatta?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Käynnistä Tor-selain"
 
@@ -2128,11 +2124,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2502,38 +2504,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2543,53 +2556,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2597,126 +2605,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/fr.po b/fr.po
index 1dc31c3a44..9f3ee83cf0 100644
--- a/fr.po
+++ b/fr.po
@@ -40,9 +40,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 16:45+0000\n"
-"Last-Translator: AO <ao@xxxxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -481,7 +481,7 @@ msgstr "Paramètres supplémentaires"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1242,9 +1242,8 @@ msgid "Dotfiles"
 msgstr "Dotfiles"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Créer un lien symbolique, dans $HOME, pour chaque fichier ou dossier qui se trouve dans le dossier `dotfiles`"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1259,7 +1258,7 @@ msgstr "Configurer le volume persistant de Tails"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Erreur"
 
@@ -1626,7 +1625,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Définir un mot de passe pour déverrouiller lâ??écran"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1714,32 +1713,29 @@ msgstr "En apprendre davantage"
 msgid "Tor Connection"
 msgstr "Connexion à Tor"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr "Invalide : {exception}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr "Vous devez utiliser un pont obfs4 pour dissimuler le fait que vous utilisez Tor"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr "Connexion à Tor sans pont�"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
-msgstr "Connexion avec les ponts par défaut�"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
-msgstr "Connexion avec des ponts personnalisés�"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr "Connexion à Tor avec les ponts par défaut�"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1765,16 +1761,16 @@ msgstr "_Ouvrir les instructions de migration"
 msgid "_Migrate Later"
 msgstr "_Migrer ultérieurement"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor nâ??est pas prêt"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor nâ??est pas prêt. Démarrer le navigateur Tor quand mêmeâ???"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Démarrer le navigateur Tor"
 
@@ -2147,12 +2143,18 @@ msgstr "La clé OpenPGP du contact est invalide : %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Le bloc de clé publique OpenPGP du contact est invalide"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
-msgstr "Vous êtes en mode hors ligne et vous ne pouvez par conséquent pas utiliser lâ??assistant de connexion de Tor. Redémarrez votre ordinateur et activez la mise en réseau si vous voulez vous connecter à Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
+msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid "Report an error"
@@ -2521,38 +2523,49 @@ msgstr "Envoyer"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "Conteneur TrueCrypt/VeraCrypt"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr "Configurer un pont Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr "Les ponts sont des relais Tor secrets. Utilisez un pont comme premier relais Tor si lâ??accès à Tor est bloqué où vous vous situez."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr "Utiliser un pont par défaut"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr "obfs4 (recommandé))"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr "meek"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr "Aucune"
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr "Demander un nouveau pont"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr "Indiquer un pont que je connais déjà"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2562,53 +2575,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr "Actuellement dans Tails, seuls les ponts obfs4 dissimulent le fait que vous utilisez Tor.\n\nLes ponts obfs4 commencent par le mot « obfs4 ».\n\nPour demander des ponts obfs4, vous pouvez envoyer un courriel vide à <tt>bridges@xxxxxxxxxxxxxx</tt> à partir dâ??une adresse courriel Gmail ou Riseup.\n"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr "Aucune"
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr "Se connecter à _Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr "Erreur de connexion à Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr "� Réseau public"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr "Si vous vous trouvez dans une boutique, un hôtel ou un aéroport, vous devrez peut-être vous connecter au réseau."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr "Essayez de vous connecter au réseau"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr "â?¢ Mandataire local"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr "Si vous utilisez un réseau dâ??entreprise ou dâ??université, vous devrez peut-être configurer un serveur mandataire."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr "Configurer un _mandataire"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr "â?¢ Ponts par courriel"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2616,126 +2624,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr "Pour demander des ponts Tor, vous pouvez aussi :\n\n1. Envoyer un courriel vide à <tt>bridges@xxxxxxxxxxxxxx</tt> à partir dâ??une adresse courriel Gmail ou Riseup.\n2. Saisir des ponts après avoir cliqué sur le bouton <i>Configurer un pont."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr "Configurer un _pont"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr "Toute votre activité sur Internet à partir de Tails passe par le réseau Tor."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr "Tor chiffre et anonymise votre connexion en passant par trois relais.\nLes relais Tor sont des serveurs exploités par différents organismes et bénévoles dans le monde entier."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
+msgid ""
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
-msgstr "<b>Configurer Tor automatiquement (plus facile)</b>\n\nNous recommandons de configurer Tor automatiquement si :\n â?¢ Vous vous connectez dâ??un réseau Wi-Fi public.\n â?¢ La connexion pourrait être bloquée dans votre pays, mais utiliser Tor nâ??est pas un crime."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
-msgstr "<b>Cacher à mon réseau local le fait que jâ??utilise Tor (plus sûr)</b>\n\nVous nâ??avez peut-être pas besoin de passer inaperçu si :\n â?? Utiliser Tor pourrait sembler suspect pour quelquâ??un qui surveillerait votre réseau domestique ou professionnel.\n â?? Il est criminel dâ??utiliser Tor dans votre pays."
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
+msgid ""
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
+"\n"
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr "Vous avez perdu la connexion au réseau local."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
-msgstr "Test de lâ??accès à Internetâ?¦"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr "Vous avez accès à Internet"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
-msgstr "Test de lâ??accès à Torâ?¦"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr "Vous pouvez vous connecter à Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr "�chec de connexion à Tor sans pont."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr "Votre réseau local bloque lâ??accès Tor."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
-msgstr "Connexion à Tor�"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
-msgstr "Vous êtes connecté à Tor avec succès\n\nVous pouvez maintenant parcourir Internet anonymement et sans censure"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr "Ouvrir le moniteur du réseau"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr "Visualiser les circuits Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr "Réinitialiser la connexion à Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr "Type de mandataire"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr "Aucun mandataire"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr "HTTP/HTTPS"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr "Adresse"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr "Nom dâ??utilisateur"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr "Adresse IP ou nom dâ??hôte"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr "Port"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr "_Enregistrer les paramètres du mandataire"
diff --git a/fy.po b/fy.po
index ce69d7cb70..3241f35a27 100644
--- a/fy.po
+++ b/fy.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1682,32 +1681,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1733,16 +1729,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2115,11 +2111,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2489,38 +2491,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2530,53 +2543,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2584,126 +2592,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ga.po b/ga.po
index eae80d3f9e..464cd72112 100644
--- a/ga.po
+++ b/ga.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
 "MIME-Version: 1.0\n"
@@ -465,7 +465,7 @@ msgstr "Socruithe Breise"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Cealaigh"
 
@@ -1226,9 +1226,8 @@ msgid "Dotfiles"
 msgstr "Ponc-chomhaid"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Déan nasc siombalach in $HOME le gach comhad nó comhadlann sa chomhadlann `dotfiles'"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1243,7 +1242,7 @@ msgstr "Socraigh imleabhar seasmhach Tails"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Earráid"
 
@@ -1616,7 +1615,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Socraigh focal faire chun an scáileán a dhíghlasáil."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Focal faire"
 
@@ -1704,32 +1703,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1755,16 +1751,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Níl Tor réidh"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Níl Tor réidh. An bhfuil fonn ort Brabhsálaí Tor a thosú mar sin féin?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Tosaigh Brabhsálaí Tor"
 
@@ -2137,11 +2133,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2511,38 +2513,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "Coimeádán TrueCrypt/VeraCrypt"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2552,53 +2565,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2606,126 +2614,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/gd.po b/gd.po
index b967756269..bd83ff0033 100644
--- a/gd.po
+++ b/gd.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
 "MIME-Version: 1.0\n"
@@ -458,7 +458,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1219,8 +1219,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1236,7 +1235,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1607,7 +1606,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1695,32 +1694,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1746,16 +1742,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2128,11 +2124,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2502,38 +2504,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2543,53 +2556,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2597,126 +2605,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/gl.po b/gl.po
index b25593d1d9..f508b4423e 100644
--- a/gl.po
+++ b/gl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -452,7 +452,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1213,8 +1213,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1230,7 +1229,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1597,7 +1596,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1685,32 +1684,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1736,16 +1732,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2118,11 +2114,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2492,38 +2494,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2533,53 +2546,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2587,126 +2595,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/gu.po b/gu.po
index a8ab150baf..f4c37ad8c6 100644
--- a/gu.po
+++ b/gu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/he.po b/he.po
index 834737d463..e43705d2b9 100644
--- a/he.po
+++ b/he.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -469,7 +469,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "×?×?×?"
 
@@ -1230,8 +1230,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1247,7 +1246,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "ש×?×?×?×?"
 
@@ -1618,7 +1617,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "ק×?×¢ ס×?ס×?×? ×?×?×?×?×?×? × ×¢×?×?ת ×?×?ס×?."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "ס×?ס×?×?"
 
@@ -1706,32 +1705,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1757,16 +1753,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor ×?×?× ×? ×?×?×?×?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor ×?×?× ×? ×?×?×?×?. ×?×?ת×?×?×? ×?ת ×?פ×?פ×? Tor ×?×?×? ×?×?ת?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "×?ת×?×? ×?ת ×?פ×?פ×? Tor"
 
@@ -2139,11 +2135,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2513,38 +2515,49 @@ msgstr "ש×?×?"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2554,53 +2567,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2608,126 +2616,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/hi.po b/hi.po
index d1aaa0bc3a..22c60350bb 100644
--- a/hi.po
+++ b/hi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -450,7 +450,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1211,8 +1211,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1228,7 +1227,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1595,7 +1594,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1683,32 +1682,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1734,16 +1730,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2116,11 +2112,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2490,38 +2492,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2531,53 +2544,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2585,126 +2593,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/hr.po b/hr.po
index 7b18f8faaf..b25616bf7e 100644
--- a/hr.po
+++ b/hr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -457,7 +457,7 @@ msgstr "Dodatne postavke"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Odustani"
 
@@ -1218,9 +1218,8 @@ msgid "Dotfiles"
 msgstr "Dotfiles"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "SimboliÄ?ki poveži svaku datoteku ili direktorij pronaÄ?en u 'dotfiles' direktoriju  u $HOME"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1235,7 +1234,7 @@ msgstr "Postavi Tails trajni pogon"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Greška"
 
@@ -1604,7 +1603,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Postavi lozinku za otkljuÄ?avanje ekrana."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Lozinka"
 
@@ -1692,32 +1691,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1743,16 +1739,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor nije spreman"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor nije spreman. Svejedno pokrenuti Tor preglednik?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Pokreni Tor preglednik"
 
@@ -2125,11 +2121,17 @@ msgstr "NevažeÄ?i OpenPGP kljuÄ? kontakta: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "NevažeÄ?i blok OpenPGP javnog kljuÄ?a kontakta"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2499,38 +2501,49 @@ msgstr "Pošalji"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "TrueCrypt/VeraCrypt spremnik"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2540,53 +2553,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2594,126 +2602,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/hu.po b/hu.po
index 40a0788bb1..ed4a219fc5 100644
--- a/hu.po
+++ b/hu.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -458,7 +458,7 @@ msgstr "További beállítások"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -1219,9 +1219,8 @@ msgid "Dotfiles"
 msgstr "Dot-fájlok"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Symlink a $HOME könyvtárban minden fájlra és könyvtárra található a `dotfiles' könyvtárban"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1236,7 +1235,7 @@ msgstr "Tails tartós kötet telepítése"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Hiba"
 
@@ -1603,7 +1602,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Adjon meg jelszót a képernyÅ? feloldáshoz."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Jelszó"
 
@@ -1691,32 +1690,29 @@ msgstr "Tudjon meg többet"
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1742,16 +1738,16 @@ msgstr "Migrálási útmutató meg_nyitása"
 msgid "_Migrate Later"
 msgstr "_Migrálás késÅ?bb"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "A Tor még nem áll készen a működésre"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "A Tor még nem áll készen a működésre. Mindenképp el szeretné indítani?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "A Tor BöngészÅ? indítása"
 
@@ -2124,11 +2120,17 @@ msgstr "�rvénytelen OpenPGP key: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "�rvénytelen OpenPGP publikus kulcs blokk"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2498,38 +2500,49 @@ msgstr "Küldés"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "TrueCrypt/VeraCrypt konténer"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2539,53 +2552,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2593,126 +2601,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/hy.po b/hy.po
index 255dc08609..6d69f66480 100644
--- a/hy.po
+++ b/hy.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -450,7 +450,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1211,8 +1211,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1228,7 +1227,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1595,7 +1594,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1683,32 +1682,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1734,16 +1730,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2116,11 +2112,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2490,38 +2492,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2531,53 +2544,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2585,126 +2593,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ia.po b/ia.po
index 62ba5211d4..f8db0b5a12 100644
--- a/ia.po
+++ b/ia.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/id.po b/id.po
index 781dafa304..0bb8c9dabb 100644
--- a/id.po
+++ b/id.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -459,7 +459,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1220,8 +1220,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1237,7 +1236,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1602,7 +1601,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1690,32 +1689,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1741,16 +1737,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2123,11 +2119,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2497,38 +2499,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2538,53 +2551,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2592,126 +2600,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/is.po b/is.po
index 1250ac4c91..fdda197a97 100644
--- a/is.po
+++ b/is.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1682,32 +1681,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1733,16 +1729,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2115,11 +2111,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2489,38 +2491,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2530,53 +2543,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2584,126 +2592,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/it.po b/it.po
index d3d32142d2..10f8c3abb6 100644
--- a/it.po
+++ b/it.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -479,7 +479,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1240,8 +1240,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1257,7 +1256,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Errore"
 
@@ -1624,7 +1623,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Imposta una password per sbloccare lo schermo."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Password"
 
@@ -1712,32 +1711,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1763,16 +1759,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor non è pronto"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor non è pronto. Avviare comunque il Tor Browser?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Avvia Tor Browser"
 
@@ -2145,11 +2141,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2519,38 +2521,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "Container TrueCrypt/VeraCrypt"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2560,53 +2573,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2614,126 +2622,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ja.po b/ja.po
index f9e52264cc..7b81faa626 100644
--- a/ja.po
+++ b/ja.po
@@ -33,8 +33,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -469,7 +469,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1230,8 +1230,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1247,7 +1246,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1612,7 +1611,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1700,32 +1699,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1751,16 +1747,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2133,11 +2129,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2507,38 +2509,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2548,53 +2561,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2602,126 +2610,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ka.po b/ka.po
index 4b7b159b66..b5da12228c 100644
--- a/ka.po
+++ b/ka.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -451,7 +451,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1212,8 +1212,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1229,7 +1228,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1596,7 +1595,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1684,32 +1683,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1735,16 +1731,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2117,11 +2113,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2491,38 +2493,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2532,53 +2545,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2586,126 +2594,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/kab.po b/kab.po
index f38e06bbb8..257bb495d5 100644
--- a/kab.po
+++ b/kab.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Kabyle (http://www.transifex.com/otf/torproject/language/kab/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/kk.po b/kk.po
index 387d69a5de..e7d45786ff 100644
--- a/kk.po
+++ b/kk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -450,7 +450,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1211,8 +1211,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1228,7 +1227,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1595,7 +1594,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1683,32 +1682,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1734,16 +1730,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2116,11 +2112,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2490,38 +2492,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2531,53 +2544,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2585,126 +2593,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/km.po b/km.po
index ccc22631bc..e1d48f24d0 100644
--- a/km.po
+++ b/km.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -445,7 +445,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "á??á??á??á??á??á??"
 
@@ -1206,8 +1206,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1223,7 +1222,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "á??á??á? á?»á??"
 
@@ -1588,7 +1587,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1676,32 +1675,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1727,16 +1723,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor á??á?ºâ??á??á?·á??á??á?¶á??á??â??á??á?½á??á??á?¶á??á??â??á??á??"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor á??á?ºâ??á??á?·á??á??á?¶á??á??â??á??á?½á??á??á?¶á??á??â??á??á??á?? á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á?? Tor á?¬?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á?? Tor"
 
@@ -2109,11 +2105,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2483,38 +2485,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2524,53 +2537,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2578,126 +2586,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/kn.po b/kn.po
index 0d0191171d..fa06fa0133 100644
--- a/kn.po
+++ b/kn.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1682,32 +1681,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1733,16 +1729,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2115,11 +2111,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2489,38 +2491,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2530,53 +2543,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2584,126 +2592,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ko.po b/ko.po
index 03cb46f788..ca1d5c142a 100644
--- a/ko.po
+++ b/ko.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -453,7 +453,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1214,8 +1214,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1231,7 +1230,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1596,7 +1595,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1684,32 +1683,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1735,16 +1731,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2117,11 +2113,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2491,38 +2493,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2532,53 +2545,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2586,126 +2594,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/lt.po b/lt.po
index 2ed831a3bb..0704e3ab7a 100644
--- a/lt.po
+++ b/lt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -462,7 +462,7 @@ msgstr "Papildomi nustatymai"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Atsisakyti"
 
@@ -1223,8 +1223,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1240,7 +1239,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Klaida"
 
@@ -1611,7 +1610,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Nusistatykite slaptažodį ekrano atrakinimui."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Slaptažodis"
 
@@ -1699,32 +1698,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1750,16 +1746,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Paleisti Tor NarÅ¡yklÄ?"
 
@@ -2132,11 +2128,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2506,38 +2508,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "TrueCrypt/VeraCrypt konteineris"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2547,53 +2560,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr "Klaida jungiantis prie Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2601,126 +2609,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/lv.po b/lv.po
index 38660a7c52..218b3cd2e7 100644
--- a/lv.po
+++ b/lv.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -455,7 +455,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1216,8 +1216,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1233,7 +1232,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1602,7 +1601,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1690,32 +1689,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1741,16 +1737,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2123,11 +2119,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2497,38 +2499,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2538,53 +2551,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2592,126 +2600,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/mk.po b/mk.po
index 9381c641bf..6c9da8e9c9 100644
--- a/mk.po
+++ b/mk.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -453,7 +453,7 @@ msgstr "Ð?ополниÑ?елни поÑ?Ñ?авки"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Ð?Ñ?кажи"
 
@@ -1214,9 +1214,8 @@ msgid "Dotfiles"
 msgstr "Ð?оÑ?даÑ?оÑ?еки"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Symlink во $HOME Ñ?екоÑ?а даÑ?оÑ?ека или диÑ?екÑ?оÑ?иÑ?м пÑ?онаÑ?дени во `доÑ?даÑ?оÑ?еки' диÑ?екÑ?оÑ?иÑ?моÑ?"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1231,7 +1230,7 @@ msgstr "Ð?оÑ?Ñ?авÑ?ваÑ?е на поÑ?Ñ?оÑ?ан пÑ?оÑ?Ñ?оÑ? на Tails"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Ð?Ñ?еÑ?ка"
 
@@ -1598,7 +1597,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Ð?оÑ?Ñ?ави лозинка за да го оÑ?клÑ?Ñ?иÑ? екÑ?аноÑ?."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Ð?озинка"
 
@@ -1686,32 +1685,29 @@ msgstr "Ð?аÑ?Ñ?и повеÑ?е"
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1737,16 +1733,16 @@ msgstr "_Ð?Ñ?воÑ?и Ð?нÑ?Ñ?Ñ?Ñ?кÑ?ии за Ð?игÑ?аÑ?иÑ?а"
 msgid "_Migrate Later"
 msgstr "_Ð?игÑ?иÑ?аÑ? подоÑ?на"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor не е подгоÑ?вен"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor не е подгоÑ?вен. Сепак да Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?ва Tor пÑ?елиÑ?Ñ?Ñ?ваÑ?оÑ?? "
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "СÑ?аÑ?Ñ?ваÑ?е на Tor пÑ?елиÑ?Ñ?Ñ?ваÑ?оÑ?"
 
@@ -2119,11 +2115,17 @@ msgstr "Ð?евалиден конÑ?акÑ? OpenPGP клÑ?Ñ?: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Ð?евалиден конÑ?акÑ? за OpenPGP Ñ?авен клÑ?Ñ? блок"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2493,38 +2495,49 @@ msgstr "Ð?Ñ?пÑ?аÑ?и"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "TrueCrypt/VeraCrypt конÑ?еÑ?неÑ?"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2534,53 +2547,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2588,126 +2596,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ml.po b/ml.po
index 2e78eef557..197540d72f 100644
--- a/ml.po
+++ b/ml.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -450,7 +450,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1211,8 +1211,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1228,7 +1227,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1595,7 +1594,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1683,32 +1682,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1734,16 +1730,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2116,11 +2112,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2490,38 +2492,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2531,53 +2544,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2585,126 +2593,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/mr.po b/mr.po
index d465869ae6..0866be7b6d 100644
--- a/mr.po
+++ b/mr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -450,7 +450,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1211,8 +1211,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1228,7 +1227,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1595,7 +1594,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1683,32 +1682,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1734,16 +1730,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2116,11 +2112,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2490,38 +2492,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2531,53 +2544,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2585,126 +2593,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ms_MY.po b/ms_MY.po
index c0c9fc7577..79c2212eac 100644
--- a/ms_MY.po
+++ b/ms_MY.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -447,7 +447,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1208,8 +1208,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1225,7 +1224,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1590,7 +1589,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1678,32 +1677,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1729,16 +1725,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2111,11 +2107,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2485,38 +2487,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2526,53 +2539,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2580,126 +2588,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/my.po b/my.po
index 937f016b28..523f20a5f9 100644
--- a/my.po
+++ b/my.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n"
 "MIME-Version: 1.0\n"
@@ -445,7 +445,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1206,8 +1206,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1223,7 +1222,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1588,7 +1587,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1676,32 +1675,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1727,16 +1723,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2109,11 +2105,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2483,38 +2485,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2524,53 +2537,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2578,126 +2586,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/nb.po b/nb.po
index 26569df0f4..9d5d647c21 100644
--- a/nb.po
+++ b/nb.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -463,7 +463,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1224,8 +1224,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1241,7 +1240,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1608,7 +1607,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1696,32 +1695,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1747,16 +1743,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2129,11 +2125,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2503,38 +2505,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2544,53 +2557,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2598,126 +2606,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ne.po b/ne.po
index 22ae88bf2a..e1c9706c6c 100644
--- a/ne.po
+++ b/ne.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Nepali (http://www.transifex.com/otf/torproject/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/nl.po b/nl.po
index 7101a7b7dd..0b04e95af1 100644
--- a/nl.po
+++ b/nl.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -479,7 +479,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1240,8 +1240,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1257,7 +1256,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1624,7 +1623,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1712,32 +1711,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1763,16 +1759,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2145,11 +2141,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2519,38 +2521,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2560,53 +2573,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2614,126 +2622,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/nl_BE.po b/nl_BE.po
index 99e66d0cc2..c28da2fb1a 100644
--- a/nl_BE.po
+++ b/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -450,7 +450,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1211,8 +1211,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1228,7 +1227,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1595,7 +1594,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1683,32 +1682,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1734,16 +1730,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2116,11 +2112,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2490,38 +2492,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2531,53 +2544,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2585,126 +2593,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/nn.po b/nn.po
index 9fb7ddcb0c..a65b9311fb 100644
--- a/nn.po
+++ b/nn.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
@@ -451,7 +451,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1212,8 +1212,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1229,7 +1228,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1596,7 +1595,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1684,32 +1683,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1735,16 +1731,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2117,11 +2113,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2491,38 +2493,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2532,53 +2545,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2586,126 +2594,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/oc.po b/oc.po
index a4645f50f4..08c137a826 100644
--- a/oc.po
+++ b/oc.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/otf/torproject/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/or.po b/or.po
index c10e1f147d..72092b60d4 100644
--- a/or.po
+++ b/or.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Oriya (http://www.transifex.com/otf/torproject/language/or/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/pa.po b/pa.po
index 155184b498..500916840f 100644
--- a/pa.po
+++ b/pa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1682,32 +1681,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1733,16 +1729,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2115,11 +2111,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2489,38 +2491,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2530,53 +2543,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2584,126 +2592,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/pl.po b/pl.po
index ad4d5df710..58f8e07d5f 100644
--- a/pl.po
+++ b/pl.po
@@ -29,9 +29,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 14:21+0000\n"
-"Last-Translator: No Ne\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -480,7 +480,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1241,8 +1241,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1258,7 +1257,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1629,7 +1628,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1717,32 +1716,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1768,16 +1764,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2150,11 +2146,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2524,38 +2526,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2565,53 +2578,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2619,126 +2627,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/pt_BR.po b/pt_BR.po
index 3d814ffdd3..e95811ba39 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -35,8 +35,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -476,7 +476,7 @@ msgstr "Configurações Adicionais"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1237,8 +1237,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1254,7 +1253,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Erro"
 
@@ -1621,7 +1620,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Senha"
 
@@ -1709,32 +1708,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1760,16 +1756,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "O Tor não está pronto"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "O Tor não está pronto. Iniciar o Navegador Tor assim mesmo?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Iniciar o Navegador Tor"
 
@@ -2142,11 +2138,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2516,38 +2518,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2557,53 +2570,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2611,126 +2619,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/pt_PT.po b/pt_PT.po
index 9a4d842320..2a8171f1c1 100644
--- a/pt_PT.po
+++ b/pt_PT.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -455,7 +455,7 @@ msgstr "Definições Adicionais"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1216,8 +1216,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1233,7 +1232,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Erro"
 
@@ -1600,7 +1599,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1688,32 +1687,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1739,16 +1735,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "O Tor não está pronto"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "O Tor não está pronto. Mesmo assim, iniciar o Tor Browser?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Iniciar o Tor Browser"
 
@@ -2121,11 +2117,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2495,38 +2497,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2536,53 +2549,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2590,126 +2598,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ro.po b/ro.po
index 4d3771fafc..b8b45d8115 100644
--- a/ro.po
+++ b/ro.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -472,7 +472,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Anulare"
 
@@ -1233,8 +1233,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1250,7 +1249,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Eroare"
 
@@ -1619,7 +1618,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "SetaÈ?i o parolÄ? pentru a debloca ecranul."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Parola"
 
@@ -1707,32 +1706,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1758,16 +1754,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor nu este pregatit"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor nu este pregÄ?tit. Se porneÈ?te navigatorul Tor Browser oricum?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "PorniÈ?i Tor Browser"
 
@@ -2140,11 +2136,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2514,38 +2516,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "Container TrueCrypt/VeraCrypt"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2555,53 +2568,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2609,126 +2617,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ru.po b/ru.po
index 5fb233517c..3bea76809a 100644
--- a/ru.po
+++ b/ru.po
@@ -39,8 +39,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -490,7 +490,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1251,8 +1251,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1268,7 +1267,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1639,7 +1638,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1727,32 +1726,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1778,16 +1774,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2160,11 +2156,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2534,38 +2536,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2575,53 +2588,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2629,126 +2637,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/si.po b/si.po
index cae91cf9a1..e58a2515e3 100644
--- a/si.po
+++ b/si.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Sinhala (http://www.transifex.com/otf/torproject/language/si/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/si_LK.po b/si_LK.po
index 7f2a6bb405..655bd3692f 100644
--- a/si_LK.po
+++ b/si_LK.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/sk.po b/sk.po
index 0d42c9a964..628d13b5f6 100644
--- a/sk.po
+++ b/sk.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -468,7 +468,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1229,8 +1229,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1246,7 +1245,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1617,7 +1616,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1705,32 +1704,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1756,16 +1752,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2138,11 +2134,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2512,38 +2514,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2553,53 +2566,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2607,126 +2615,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/sl.po b/sl.po
index b9a00bf194..a0388a6b79 100644
--- a/sl.po
+++ b/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -459,7 +459,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1220,8 +1220,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1237,7 +1236,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1608,7 +1607,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1696,32 +1695,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1747,16 +1743,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2129,11 +2125,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2503,38 +2505,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2544,53 +2557,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2598,126 +2606,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/son.po b/son.po
index 59c199d13b..780ca68dbf 100644
--- a/son.po
+++ b/son.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Songhay (http://www.transifex.com/otf/torproject/language/son/)\n"
 "MIME-Version: 1.0\n"
@@ -443,7 +443,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1204,8 +1204,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1221,7 +1220,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1586,7 +1585,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1674,32 +1673,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1725,16 +1721,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2107,11 +2103,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2481,38 +2483,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2522,53 +2535,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2576,126 +2584,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/sq.po b/sq.po
index 593208a198..b9b16ec3a3 100644
--- a/sq.po
+++ b/sq.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 15:28+0000\n"
-"Last-Translator: Besnik Bleta <besnik@xxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -452,7 +452,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1213,8 +1213,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1230,7 +1229,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1597,7 +1596,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1685,32 +1684,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1736,16 +1732,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2118,11 +2114,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2492,38 +2494,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2533,53 +2546,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2587,126 +2595,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/sr.po b/sr.po
index 357dd6b969..6ede0c104d 100644
--- a/sr.po
+++ b/sr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -457,7 +457,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1218,8 +1218,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1235,7 +1234,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1604,7 +1603,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1692,32 +1691,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1743,16 +1739,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2125,11 +2121,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2499,38 +2501,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2540,53 +2553,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2594,126 +2602,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/sv.po b/sv.po
index 904000b585..390725da2c 100644
--- a/sv.po
+++ b/sv.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -465,7 +465,7 @@ msgstr "Ytterligare inställningar"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1226,9 +1226,8 @@ msgid "Dotfiles"
 msgstr "Punktfiler"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Länka in i $HOME varje fil och katalog som finns i `dotfiles' katalogen"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1243,7 +1242,7 @@ msgstr "Konfigurera bestående lagring för Tails"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Fel"
 
@@ -1610,7 +1609,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Ställ in ett lösenord för att låsa upp skärmen."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Lösenord"
 
@@ -1698,32 +1697,29 @@ msgstr "Läs mer"
 msgid "Tor Connection"
 msgstr "Tor-anslutning"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr "Ogiltig: {exception}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr "Du måste konfigurera en obfs4-bro för att dölja att du använder Tor"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr "Ansluter till Tor utan broar..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
-msgstr "Ansluter till standardbroar..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
-msgstr "Ansluter med anpassade broar..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr "Ansluter till Tor med standardbroar..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1749,16 +1745,16 @@ msgstr "_Ã?ppna migreringsinstruktioner"
 msgid "_Migrate Later"
 msgstr "_Migrera senare"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor är inte redo"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor är inte redo. Starta Tor Browser ändå?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Starta Tor Browser"
 
@@ -2131,11 +2127,17 @@ msgstr "Ogiltig kontakt OpenPGP-nyckel: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Ogiltig OpenPGP publikt nyckelblock"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2505,38 +2507,49 @@ msgstr "Skicka"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "TrueCrypt/VeraCrypt behållare"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr "Konfigurera en Tor-bro"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr "Broar är hemliga Tor-reläer. Använd en bro som din första Tor-relä om åtkomst till Tor är blockerad där du är."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr "Använd en standardbro"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr "obfs4 (rekommenderas)"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr "meek"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr "Ingen"
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr "Begär en ny bro"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr "Skriv in en bro som jag redan känner till"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2546,53 +2559,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr "För närvarande i Tails döljer bara obfs4-broar att du använder Tor.\n\nobfs4-broar börjar med ordet 'obfs4'.\n\nFör att begära obfs4-broar kan du skicka ett tomt e-postmeddelande till\n<tt>bridges@xxxxxxxxxxxxxx</tt> från en Gmail- eller Riseup-e-postadress.\n"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr "Ingen"
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr "Anslut till _Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr "Anslutning till Tor misslyckades"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr "� Publikt nätverk"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr "Om du befinner dig i en butik, hotell eller flygplats kan du behöva logga in på nätverket."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr "Försök att logga in på nätverket"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr "â?¢ Lokal proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr "Om du är på ett företags- eller universitetsnätverk kan du behöva konfigurera en proxy."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr "Konfigurera en _proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr "� Broar över e-post"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2600,126 +2608,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr "För att begära Tor-broar kan du också:\n\n1. Skicka en tom e-post till <tt>bridges@xxxxxxxxxxxxxx</tt> från en Gmail- eller Riseup-e-postadress.\n2. Skriv broar genom att klicka på knappen <i>Konfigurera en bro</i>"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr "Konfigurera en _bro"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr "Allt du gör på internet från Tails går via Tor-nätverket."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr "Tor krypterar och anonymiserar din anslutning genom att skicka den genom tre reläer.\nTor-reläer är servrar som drivs av olika organisationer och volontärer runt om i världen."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
-msgstr "<b>Konfigurera Tor automatiskt (lättare)</b>\n\nVi rekommenderar att konfigurera Tor automatiskt om:\n � Du ansluter från ett publikt Wi-Fi-nätverk.\n � Anslutning till Tor kan vara blockerat i ditt land, men att använda Tor är inte kriminaliserat."
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
+msgid ""
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
-msgstr "<b>Dölj för mitt lokala nätverk att jag använder Tor (säkrare)</b>\n\nDu kan behöva använda obemärkt om:\n - Använda Tor kan se misstänkt ut för någon som övervakar ditt hem- eller arbetsnätverk.\n - Använda Tor är kriminaliserat i ditt land."
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
+"\n"
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr "Du har tappat bort anslutningen till det lokala nätverket."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
-msgstr "Testar internetåtkomst..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr "Du har tillgång till internet"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
-msgstr "Testar åtkomst till Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr "Du kan ansluta till Tor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr "Det gick inte att ansluta till Tor utan broar."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr "Ditt lokala nätverk blockerar åtkomst till Tor."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
-msgstr "Ansluter till Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
-msgstr "Ansluten till Tor\n\nDu kan nu surfa på internet anonymt och ocensurerat"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr "�ppna nätverksmonitor"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr "Visa Tor-kretsar"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr "�terställ Tor-anslutning"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr "Proxytyp"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr "Ingen proxy"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr "Adress"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr "IP-adress eller värdnamn"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr "Port"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr "_Spara proxyinställningar"
diff --git a/sw.po b/sw.po
index d84c30d50e..315317c0f6 100644
--- a/sw.po
+++ b/sw.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1682,32 +1681,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1733,16 +1729,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2115,11 +2111,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2489,38 +2491,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2530,53 +2543,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2584,126 +2592,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ta.po b/ta.po
index 55d5ccb0dc..363f888de0 100644
--- a/ta.po
+++ b/ta.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
@@ -450,7 +450,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1211,8 +1211,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1228,7 +1227,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1595,7 +1594,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1683,32 +1682,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1734,16 +1730,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2116,11 +2112,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2490,38 +2492,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2531,53 +2544,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2585,126 +2593,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/tails.pot b/tails.pot
index 771ce776c5..3eba801b52 100644
--- a/tails.pot
+++ b/tails.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/te.po b/te.po
index df4e90f69a..53260df5e7 100644
--- a/te.po
+++ b/te.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1681,32 +1680,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1732,16 +1728,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2114,11 +2110,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2488,38 +2490,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2529,53 +2542,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2583,126 +2591,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/th.po b/th.po
index cb9463ec7b..e721fbe31c 100644
--- a/th.po
+++ b/th.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1592,7 +1591,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1680,32 +1679,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1731,16 +1727,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2113,11 +2109,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2487,38 +2489,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2528,53 +2541,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2582,126 +2590,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/tr.po b/tr.po
index 52f19158ba..4c8acc63eb 100644
--- a/tr.po
+++ b/tr.po
@@ -33,9 +33,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 13:14+0000\n"
-"Last-Translator: T. E. Kalayci <tekrei@xxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -474,7 +474,7 @@ msgstr "Ek Ayarlar"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "Ä°ptal"
 
@@ -1235,9 +1235,8 @@ msgid "Dotfiles"
 msgstr "Dotfiles"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "`dotfiles' klasöründe bulunan tüm dosya ve klasörler için $HOME üzerinde sembolik baÄ?lantı oluÅ?turur"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1252,7 +1251,7 @@ msgstr "Tails kalıcı depolama birimini kur"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "Hata"
 
@@ -1619,7 +1618,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "Ekran kilidini açmak için bir parola ayarlayın."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "Parola"
 
@@ -1707,32 +1706,29 @@ msgstr "Ayrıntılı Bilgi Alın"
 msgid "Tor Connection"
 msgstr "Tor BaÄ?lantısı"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr "Geçersiz: {exception}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr "Tor kullandıÄ?ınızı gizlemek için bir obfs4 köprüsü yapılandırmalısınız"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr "Köprü kullanmadan Tor baÄ?lantısı kuruluyor..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
-msgstr "Varsayılan köprüler kullanılarak baÄ?lantı kuruluyor..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
-msgstr "Ã?zel köprüler kullanılarak baÄ?lantı kuruluyor..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr "Varsayılan köprüler kullanılarak Tor baÄ?lantısı kuruluyor..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1758,16 +1754,16 @@ msgstr "_Aktarma Yönergelerini Aç"
 msgid "_Migrate Later"
 msgstr "_Sonra Aktar"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor hazır deÄ?il"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor hazır deÄ?il. Gene de Tor Browser baÅ?latılsın mı?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "Tor Browser BaÅ?latılsın"
 
@@ -2140,11 +2136,17 @@ msgstr "Ä°letiÅ?im OpenPGP anahtarı geçersiz: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Ä°letiÅ?im OpenPGP herkese açık anahtar bloÄ?u geçersiz"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2514,38 +2516,49 @@ msgstr "Gönder"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "TrueCrypt/VeraCrypt kapsayıcısı"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr "Bir Tor köprüsü yapılandırın"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr "Köprüler gizli Tor aktarıcılarıdır. BulunduÄ?unuz yerde Tor aÄ?ı ile baÄ?lantı kurulması engelleniyorsa ilk Tor aktarıcınız olarak bir köprü kullanın."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr "Varsayılan köprülerden biri kullanılsın"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr "obfs4 (önerilir)"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr "meek"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr "Hiçbiri"
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr "Yeni köprü isteÄ?inde bulun"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr "BildiÄ?im bir köprüyü yazacaÄ?ım"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2555,53 +2568,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr "Å?u anda Tails üzerinde yalnız obfs4 köprüleri Tor kullandıÄ?ınızı gizleyebilir.\n\nobfs4 köprüleri 'obfs4' ile baÅ?lar.\n\nobfs4 köprü isteÄ?inde bulunmak için, bir Gmail ya da Riseup adresinden\n<tt>bridges@xxxxxxxxxxxxxx</tt> adresine boÅ? bir e-posta gönderin.\n"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr "Hiçbiri"
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr "_Tor BaÄ?lantısı Kur"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr "Tor baÄ?lantısı kurulurken sorun çıktı"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr "â?¢ Herkese açık aÄ?"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr "MaÄ?aza, otel ya da hava alanı gibi bir yerdeyseniz aÄ?da oturum açmanız gerekebilir."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr "AÄ?da oturum açmayı deneyin"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr "â?¢ Yerel vekil sunucu"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr "Kurum ya da üniversite gibi bir yerdeyseniz bir vekil sunucu yapılandırmanız gerekebilir."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr "Bir _Vekil Sunucu Yapılandır"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr "� E-posta ile köprü almak"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2609,126 +2617,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr "Tor köprü isteÄ?inde bulunmak için Å?unları da yapabilirsiniz:\n\n1. Bir Gmail ya da Riseup adresinden <tt>bridges@xxxxxxxxxxxxxx</tt> adresine boÅ? bir e-posta gönderin.\n2. <i>Bir Tor Köprüsü Yapılandırın</i> düÄ?mesine tıklayıp köprüleri yazın"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr "Bir _Köprü Yapılandırın"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr "Ä°nternet üzerinde Tails uygulaması ile yaptıÄ?ınız her Å?ey Tor aÄ?ından geçer."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr "Tor aÄ?ı, baÄ?lantınızı 3 aktarıcıdan geçirip Å?ifreleyerek anonimleÅ?tirir.\nTor aktarıcıları, tüm dünyadan farklı kuruluÅ?lar ve gönüllüler tarafından iÅ?letilen sunuculardır."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
-msgstr "<b>Tor baÄ?lantısını otomatik olarak yapılandırın (daha kolay)</b>\n\nTor baÄ?lantısını lu durumlarda otomatik olarak yapılandırmanızı öneririz:\n â?¢ Herkese açık bir Wi-Fi baÄ?lantısı kullanıyorsanız.\n â?¢ Ã?lkenizde Tor baÄ?lantısı kurmak engelleniyorsa ancak suç sayılmıyorsa."
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
+msgid ""
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
-msgstr "<b>Yerel aÄ?ımda Tor kullandıÄ?ım gizlensin (daha güvenli)</b>\n\nÅ?u durumlarda fark edilmeden baÄ?lantı kurmanız gerekebilir:\n - Tor kullanmak, ev veya iÅ? aÄ?ınızı izleyen birine Å?üpheli görünecekse.\n - Ã?lkenizde Tor kullanımı suç sayılıyorsa."
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
+"\n"
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr "Yerel aÄ? ile baÄ?lantınızı kaybettiniz."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
-msgstr "Internet eriÅ?imi sınanıyor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr "Ä°nternet eriÅ?iminiz var"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
-msgstr "Tor aÄ?ı eriÅ?imi sınanıyor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr "Tor baÄ?lantısı kurabilirsiniz"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr "Köprü kullanmadan Tor baÄ?lantısı kurulamadı."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr "Yerel aÄ?ınızdan Tor baÄ?lantısı kurulması engelleniyor."
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
-msgstr "Tor baÄ?lantısı kuruluyor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
-msgstr "Tor baÄ?lantısı kuruldu\n\nArtık anonim kalarak Internet üzerinde sansürsüz dolaÅ?abilirsiniz"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr "AÄ? Ä°zleyiciyi Aç"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr "Tor Devrelerini Görüntüle"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr "Tor BaÄ?lantısını Sıfırla"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr "Vekil Sunucu Türü"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr "Vekil sunucu yok"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr "Adres"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr "IP adresi ya da sunucu adı"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr "Kapı no"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr "_Vekil sunucu ayarlarını kaydet"
diff --git a/uk.po b/uk.po
index 58e56b3e54..0ea587b11b 100644
--- a/uk.po
+++ b/uk.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -470,7 +470,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1231,8 +1231,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1248,7 +1247,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1619,7 +1618,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1707,32 +1706,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1758,16 +1754,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2140,11 +2136,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2514,38 +2516,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2555,53 +2568,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2609,126 +2617,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/ur.po b/ur.po
index fce6a74c7d..3fda92cae6 100644
--- a/ur.po
+++ b/ur.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -449,7 +449,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1210,8 +1210,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1227,7 +1226,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1682,32 +1681,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1733,16 +1729,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2115,11 +2111,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2489,38 +2491,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2530,53 +2543,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2584,126 +2592,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/uz.po b/uz.po
index 77ea03ec8e..fdcce92d07 100644
--- a/uz.po
+++ b/uz.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -443,7 +443,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1204,8 +1204,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1221,7 +1220,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1586,7 +1585,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1674,32 +1673,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1725,16 +1721,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2107,11 +2103,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2481,38 +2483,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2522,53 +2535,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2576,126 +2584,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/vi.po b/vi.po
index 43c8d5df3c..9820687d96 100644
--- a/vi.po
+++ b/vi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -445,7 +445,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1206,8 +1206,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1223,7 +1222,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1588,7 +1587,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1676,32 +1675,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1727,16 +1723,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2109,11 +2105,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2483,38 +2485,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2524,53 +2537,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2578,126 +2586,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/zh_CN.po b/zh_CN.po
index f3e47f773b..8bfbf8c802 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -39,8 +39,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -475,7 +475,7 @@ msgstr "��设置"
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr "å??æ¶?"
 
@@ -1236,9 +1236,8 @@ msgid "Dotfiles"
 msgstr "Dotfiles"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "å°?â??dotfilesâ??ç?®å½?中ç??æ??æ??æ??件å??æ??件夹è¿?å?¥ $HOME ç??符å?·é?¾æ?¥"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
+msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
 msgid "Custom"
@@ -1253,7 +1252,7 @@ msgstr "设置 Tails 永��"
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr "é??误"
 
@@ -1618,7 +1617,7 @@ msgid "Set up a password to unlock the screen."
 msgstr "设å®?解é??å±?å¹?ç??å¯?ç ?"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr "��"
 
@@ -1706,32 +1705,29 @@ msgstr "�解��"
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1757,16 +1753,16 @@ msgstr "_æ??å¼?è¿?移æ??å??"
 msgid "_Migrate Later"
 msgstr "_以å??è¿?移"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr "Tor �就绪"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor æ?ªå°±ç»ªã??ç¡®å®?å?¯å?¨ Tor æµ?è§?å?¨ï¼?"
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr "�� Tor ���"
 
@@ -2139,11 +2135,17 @@ msgstr "æ? æ??ç??è??系人 OpenPGP å¯?é?¥ï¼?%s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "æ? æ??ç??è??系人 OpenPGP å?¬é?¥å??"
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2513,38 +2515,49 @@ msgstr "é??å?º"
 msgid "TrueCrypt/VeraCrypt container"
 msgstr "TrueCrypt/VeraCrypt 容�"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr "obfs4ï¼?æ?¨è??ï¼?"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr "meek"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr "æ? "
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2554,53 +2567,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr "æ? "
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2608,126 +2616,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr "代ç??æ??å?¡å?¨ç±»å??"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr "å?°å??"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr "ç?¨æ?·å??"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr "IP å?°å??æ??主æ?ºå??"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr "端�"
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/zh_HK.po b/zh_HK.po
index 2d964e2bba..b997340063 100644
--- a/zh_HK.po
+++ b/zh_HK.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -448,7 +448,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1209,8 +1209,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1226,7 +1225,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1591,7 +1590,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1679,32 +1678,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1730,16 +1726,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2112,11 +2108,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2486,38 +2488,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2527,53 +2540,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2581,126 +2589,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""
diff --git a/zh_TW.po b/zh_TW.po
index 2f2f65f7b6..42d471f83e 100644
--- a/zh_TW.po
+++ b/zh_TW.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 17:48+0200\n"
-"PO-Revision-Date: 2021-05-25 12:30+0000\n"
+"POT-Creation-Date: 2021-05-26 10:48+0200\n"
+"PO-Revision-Date: 2021-05-26 09:29+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -458,7 +458,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:581
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: config/chroot_local-includes/usr/bin/tor-browser:50
 msgid "Cancel"
 msgstr ""
 
@@ -1219,8 +1219,7 @@ msgid "Dotfiles"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgid "Symlink every file in the Dotfiles folder into the Home folder"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111
@@ -1236,7 +1235,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:221
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:77
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:29
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:313
 msgid "Error"
 msgstr ""
 
@@ -1601,7 +1600,7 @@ msgid "Set up a password to unlock the screen."
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1329
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1613
 msgid "Password"
 msgstr ""
 
@@ -1689,32 +1688,29 @@ msgstr ""
 msgid "Tor Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:183
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
 #, python-brace-format
 msgid "Invalid: {exception}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:195
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:207
 msgid "You need to configure an obfs4 bridge to hide that you are using Tor"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:292
-msgid "Connecting to Tor without bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:304
+msgid "Connecting to Tor without bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:299
-msgid "Connecting with default bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:311
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:335
+msgid "Connecting to Tor with default bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:306
-msgid "Connecting with custom bridges..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:318
+msgid "Connecting to Tor with custom bridgesâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:323
-msgid "Connecting to Tor with default bridges..."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tca/ui/main_window.py:410
 msgid ""
 "Connected to Tor successfully!\n"
 "\n"
@@ -1740,16 +1736,16 @@ msgstr ""
 msgid "_Migrate Later"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:46
+#: config/chroot_local-includes/usr/bin/tor-browser:47
 msgid "Tor is not ready"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:47
+#: config/chroot_local-includes/usr/bin/tor-browser:48
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/bin/tor-browser:48
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1156
+#: config/chroot_local-includes/usr/bin/tor-browser:49
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1410
 msgid "Start Tor Browser"
 msgstr ""
 
@@ -2122,11 +2118,17 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tca:134
+#: config/chroot_local-includes/usr/local/bin/tca:128
+msgid "You turned on Offline Mode in the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:129
+msgid "It is impossible to connect to Tor in Offline Mode."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/bin/tca:130
 msgid ""
-"You are in Offline mode, therefore you cannot use Tor Connection assistant.\n"
-"\n"
-"Reboot and enable networking if you want to connect to Tor."
+"To connect to Tor and the Internet, restart Tails without Offline Mode."
 msgstr ""
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
@@ -2496,38 +2498,49 @@ msgstr ""
 msgid "TrueCrypt/VeraCrypt container"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:54
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:686
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:55
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:805
 msgid "Configure a Tor bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:72
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:71
 msgid ""
 "Bridges are secret Tor relays. Use a bridge as your first Tor relay if "
 "accessing Tor is blocked from where you are."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:115
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
+msgid ""
+"<a href=\"doc/first_steps/welcome_screen/bridge_mode\">Learn more about Tor "
+"bridges</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:139
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:142
 msgid "obfs4 (recommended)"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:140
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:143
 msgid "meek"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:158
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:166
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:980
+msgid "None"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:194
 msgid "Request a new bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:180
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:227
 msgid "Type in a bridge that I already know"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:201
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:245
 msgid ""
 "Currently in Tails, only obfs4 bridges hide that you are using Tor.\n"
 "\n"
@@ -2537,53 +2550,48 @@ msgid ""
 "<tt>bridges@xxxxxxxxxxxxxx</tt> from a Gmail or Riseup email address.\n"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:292
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
-msgid "None"
-msgstr ""
-
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:332
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:790
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:363
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1021
 msgid "Connect to _Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:374
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:405
 msgid "Error connecting to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:400
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:428
 msgid "â?¢ Public network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:419
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:448
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:432
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:468
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:498
 msgid "â?¢ Local proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:487
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:518
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a proxy."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:500
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a _Proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:537
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:569
 msgid "â?¢ Bridges over email"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:556
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:589
 msgid ""
 "To request Tor bridges, you can also:\n"
 "\n"
@@ -2591,126 +2599,164 @@ msgid ""
 "2. Type bridges clicking on the <i>Configure a Bridge</i> button"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:573
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:606
 msgid "Configure a _Bridge"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:612
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:647
 msgid ""
 "Everything you do on the Internet from Tails goes through the Tor network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:627
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:662
 msgid ""
 "Tor encrypts and anonymizes your connection by passing it through 3 relays.\n"
 "Tor relays are servers operated by different organizations and volunteers around the world."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:658
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:700
+msgid "<b>Connect to Tor automatically (easier)</b>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:748
 msgid ""
-"<b>Configure Tor automatically (easier)</b>\n"
+"We recommend connecting to Tor automatically if you are on a public Wi-Fi "
+"network or if many people in your country use Tor to circumvent censorship."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:766
+msgid ""
+"Tails will connect to several public services to diagnose your Internet connection and try different ways to connect to Tor until it succeeds.\n"
+"\n"
+"Someone monitoring your Internet connection could identify this online traffic as coming from a Tails user.\n"
 "\n"
-"We recommend configuring Tor automatically if:\n"
-" â?¢ You are connecting from a public Wi-Fi network.\n"
-" â?¢ Connecting to Tor might be blocked in your country but using Tor is not criminalized."
+"<a href=\"XXX\">Learn more about how this auto-configuration works.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:850
+msgid ""
+"Tor bridges are hidden Tor relays. Use a bridge as your first Tor relay if connecting to Tor is blocked, for example in China, on some public networks, or parental controls.\n"
+"\n"
+"Choose this option if you already know that you need bridges. Otherwise, Tails will autodetect whether you need bridges to connect to Tor from your local network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:893
+msgid "<b>Hide to my local network that I'm connecting to Tor (safer)</b>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:747
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:941
 msgid ""
-"<b>Hide to my local network that I'm using Tor (safer)</b>\n"
+"You might need to go unnoticed if using Tor could look suspicious to someone"
+" who monitors your Internet connection."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:959
+msgid ""
+"Tails will only connect to Tor after you configured Tor bridges. Bridges are secret Tor relays that hide that you are connecting to Tor.\n"
+"\n"
+"Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.\n"
 "\n"
-"You might need to go unnoticed if:\n"
-" - Using Tor might look suspicious to someone monitoring your home or work network.\n"
-" - Using Tor is criminalized in your country."
+"You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.\n"
+"\n"
+"<a href=\"XXX\">Learn more about how Tor bridges hide that you connect to Tor.</a>"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1009
+msgid "<a href=\"FIXME\">Learn more about how to connect to Tor</a>"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:842
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1073
 msgid "You lost connection to the local network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:882
-msgid "Testing Internet access..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1113
+msgid "Testing Internet accessâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:922
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1153
 msgid "You have access to the Internet"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:956
-msgid "Testing access to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1187
+msgid "Testing access to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:999
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1230
 msgid "You can connect to Tor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1029
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1260
 msgid "Failed to connect to Tor without bridges."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1048
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1276
 msgid "Your local network is blocking access to Tor."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1078
-msgid "Connecting to Tor..."
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1308
+msgid "Connecting to Torâ?¦"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1128
-msgid ""
-"Connected to Tor successfully\n"
-"\n"
-"You can now browse the Internet anonymously and uncensored"
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1364
+msgid "Connected to Tor successfully"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1388
+msgid "You can now browse the Internet anonymously and uncensored."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1176
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1429
 msgid "Open Network Monitor"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1190
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1443
 msgid "View Tor Circuits"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1204
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1457
 msgid "Reset Tor Connection"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1253
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
+msgid "Configure a Proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1523
 msgid "Proxy Type"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1266
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1537
 msgid "No proxy"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1267
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1538
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1268
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1539
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1269
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1540
 msgid "HTTP / HTTPS"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1282
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1556
 msgid "Address"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1293
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1570
 msgid "Username"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1306
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1584
 msgid "IP address or hostname"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1318
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1599
 msgid "Port"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1414
+#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1693
 msgid "_Save proxy settings"
 msgstr ""

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