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

translation at torproject.org translation at torproject.org
Mon Jun 29 00:46:49 UTC 2020


commit aa5950adb8a9794590a6f456c08657c5ea215bc0
Author: Translation commit bot <translation at torproject.org>
Date:   Mon Jun 29 00:46:48 2020 +0000

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

diff --git a/ach.po b/ach.po
index bc9c99e7f1..7d7b84905a 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Acoli (http://www.transifex.com/otf/torproject/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/af.po b/af.po
index 1966a4052b..1d6578fe1b 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ar.po b/ar.po
index 239c3c30c3..cd6a538b16 100644
--- a/ar.po
+++ b/ar.po
@@ -34,9 +34,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-25 17:03+0000\n"
-"Last-Translator: Mustafa <mustafasheref8 at gmail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,7 +70,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -114,12 +114,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Launch"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Exit"
 
@@ -402,52 +402,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -486,26 +490,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -568,7 +572,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -676,78 +680,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -764,7 +776,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "خطأ"
 
@@ -867,7 +879,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -879,7 +891,7 @@ msgstr[5] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1211,7 +1223,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "خطأ:"
 
@@ -1412,65 +1424,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "جاري تشغيل المتصفح الغير آمن..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "قد يستغرق هذا بعض الوقت، يرجى التحلي بالصبر."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "جاري إيقاف تشغيل المتصفح الغير الآمن..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "فشلت محاولة إعادة تشغيل تور."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "المتصفح الغير الآمن"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "فشلت محاولة تشغيل chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1563,7 +1583,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1587,7 +1607,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1608,7 +1628,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1631,52 +1651,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ast.po b/ast.po
index 188a68c49a..c1d6079490 100644
--- a/ast.po
+++ b/ast.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/az.po b/az.po
index 6572c6dd7e..56d35857f4 100644
--- a/az.po
+++ b/az.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1177,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1378,65 +1390,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1529,7 +1549,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1597,52 +1617,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/be.po b/be.po
index b8709898d0..9838c724e9 100644
--- a/be.po
+++ b/be.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1180,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1381,65 +1393,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1532,7 +1552,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1556,7 +1576,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1577,7 +1597,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1600,52 +1620,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/bg.po b/bg.po
index 48fc863e85..1387aca64c 100644
--- a/bg.po
+++ b/bg.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -99,12 +99,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -387,52 +387,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -471,26 +475,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -553,7 +557,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -661,78 +665,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -749,7 +761,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -852,7 +864,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -860,7 +872,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1188,7 +1200,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1389,65 +1401,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1540,7 +1560,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1564,7 +1584,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1585,7 +1605,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1608,52 +1628,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/bn.po b/bn.po
index 827a552b96..6ba27e2037 100644
--- a/bn.po
+++ b/bn.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: code smite <codesmite at gmail.com>\n"
 "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -90,12 +90,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -378,52 +378,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -462,26 +466,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -544,7 +548,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -652,78 +656,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -740,7 +752,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -843,7 +855,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -851,7 +863,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1179,7 +1191,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1380,65 +1392,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1531,7 +1551,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1555,7 +1575,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1576,7 +1596,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1599,52 +1619,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/br.po b/br.po
index 775ec0c31e..5f6102e28a 100644
--- a/br.po
+++ b/br.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -852,7 +864,7 @@ msgstr[4] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1183,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1384,65 +1396,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1535,7 +1555,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1559,7 +1579,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1580,7 +1600,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1603,52 +1623,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/bs.po b/bs.po
index fc7381ecd1..9e2ab6a545 100644
--- a/bs.po
+++ b/bs.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[2] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ca.po b/ca.po
index 7c70beb4c0..3d0f50775a 100644
--- a/ca.po
+++ b/ca.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Benny Beat <bennybeat at gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgid ""
 msgstr "<h1>Ajudeu-nos a arreglar aquest error!</h1>\n<p>Llegeix <a href=\"%s\">les nostres instruccions de comunicació d'errors</a>.</p>\n<p><strong>No incloeu més informació personal \nque la necessària!</strong></p>\n<h2>Sobre el fet de donar-nos una adreça de correu</h2>\n<p>\nDonar-nos una adreça de correu ens permet contactar amb vosaltres per aclarir el\nproblema. Això és necessari per la majoria d'informes que rebem, ja que la major part\nd'informes sense informació de contacte són inútils. D'altra banda, aquest fet també dóna\nuna oportunitat als espies o al vostre proveïdor d'internet per confirmar que esteu usant el Tails.\n</p> \n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -104,12 +104,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Voleu iniciar l'Electrum igualment?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Executa"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Surt"
 
@@ -392,52 +392,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -476,26 +480,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -558,7 +562,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -666,78 +670,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -754,7 +766,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Error"
 
@@ -857,7 +869,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -865,7 +877,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1193,7 +1205,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "Hi ha hagut un error:"
 
@@ -1394,65 +1406,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Segur que voleu executar el navegador insegur?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "L'activitat de la xarxa amb el navegador insegur <b>no és anònima</b>. \\nUtilitzeu només el navegador insegur si és necessari, per exemple\\nsi heu d'iniciar sessió o registrar-vos per activar la connexió a internet. "
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Iniciant el Navegador Insegur..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Això pot trigar una estona, espereu."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Apagant el Navegador Insegur"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Això pot tardar una estona, no reinicieu el navegador insegur fins que no s'hagi apagat correctament."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Hi ha hagut un error mentre es reiniciava Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Navegador Insegur"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Un altre navegador insegur està essent executat o netejat. Proveu-ho d'aquí una estona. "
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "S'ha fallat en configurar chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "S'ha fallat en configurar el navegador."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "No s'ha obtingut cap servidor DNS a través del DHCP o configurat manualment al NetworkManager. "
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "S'ha fallat en executar el navegador."
 
@@ -1545,7 +1565,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1569,7 +1589,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1590,7 +1610,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1613,52 +1633,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/cs.po b/cs.po
index 71ef779434..2dca7f0412 100644
--- a/cs.po
+++ b/cs.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,7 +58,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Dodatečný software"
@@ -102,12 +102,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Spustit"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Ukončit"
 
@@ -390,54 +390,58 @@ msgstr "Přidat"
 msgid "Back"
 msgstr "Zpět"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Heslo pro správu"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Přímo (výchozí)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Bridge & Proxy"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Offline"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Zapnuto (výchozí)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Vypnuto (výchozí)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Vypnout"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Spustit Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -474,28 +478,28 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Jazyk"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formáty"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -556,7 +560,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "Zobrazit heslo"
 
@@ -664,78 +668,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -752,7 +764,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Chyba"
 
@@ -855,7 +867,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -865,7 +877,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1195,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "chyba:"
 
@@ -1396,65 +1408,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Opravdu chcete spustit Nezabezpečený prohlížeč?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Spouštění Nezabezpečeného prohlížeče..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Může to chvíli trvat, chvilku strpení prosím."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Ukončování Nezabezpečeného prohlížeče..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Může to chvíli trvat a Nezabezpečený prohlížeč nebudete moci znovu spustit, dokud nebude správně ukončen."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Opětovné spuštění sítě Tor nebylo úspěšné."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Nezabezpečený prohlížeč"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Další Nezabezpečený prohlížeč je spuštěn nebo se čistí. Zkuste to znovu později."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Nepodařilo se nastavit \"chroot\"."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Prostřednictvím DHCP ani ručním nastavením v Síťovém správci nebyl nastaven žádný DNS server."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1547,7 +1567,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Heslo pro správu"
 
@@ -1571,7 +1591,7 @@ msgid "Disable"
 msgstr "Zakázat"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1592,7 +1612,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Nefalšovat MAC adresy"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Konfigurace sítě"
 
@@ -1615,52 +1635,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr "Zakázat všechny sítě"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Po připojení k síti nakonfigurujete přemostění Tor a lokální proxy."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Vítejte v Tails!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Výchozí nastavení"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Šifrované _Trvalé úložiště"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Trvalé úložiště je odemčeno. Restart Tails ho znovu uzamkne."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Další nastavení"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Přidat další nastavení"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Vypnout"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Spustit Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Souborové kontejnery"
diff --git a/cy.po b/cy.po
index e07b35c3ab..194b2e2dda 100644
--- a/cy.po
+++ b/cy.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -90,12 +90,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -378,52 +378,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -462,26 +466,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -544,7 +548,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -652,78 +656,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -740,7 +752,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -843,7 +855,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -853,7 +865,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1183,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1384,65 +1396,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1535,7 +1555,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1559,7 +1579,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1580,7 +1600,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1603,52 +1623,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/da.po b/da.po
index a49c20e9cd..9de54c9b2c 100644
--- a/da.po
+++ b/da.po
@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 16:31+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +56,7 @@ msgid ""
 msgstr "<h1>Hjælp os med at rette din fejl!</h1>\n<p>Læs <a href=\"%s\">vores instruktioner til fejlrapportering</a>.</p>\n<p><strong>Inkludér ikke mere personlig information end hvad der\ner brug for!</strong></p>\n<h2>Angående det at give os en e-mailadresse</h2>\n<p>\nVed at give os en e-mailadresse giver det os mulighed til at kontakte dig for at præcisere problemet. Det\ner nødvendigt for langt størstedelen af de rapporter vi modtager, idet de fleste rapporter\nuden kontaktinformation er ubrugelige. På den anden side giver det også\nen mulighed for aflytning, såsom din e-mail- eller internetudbyder, for at\nbekræfte at du bruger Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Yderligere software"
@@ -100,12 +100,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Vil du starte Electrum alligevel?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Start"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Afslut"
 
@@ -388,54 +388,58 @@ msgstr "Tilføj"
 msgid "Back"
 msgstr "Tilbage"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Administrationsadgangskode"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "_MAC-adresse spoofing"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "_Netværksforbindelse"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Direkte (standard)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Bro og proxy"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Offline"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Til (standard)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Til"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Fra"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Fra (standard)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Luk ned"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Start Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -472,28 +476,28 @@ msgstr "umount mislykkedes med returkoden {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlocking…"
 msgstr "Låser op…"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "LÃ¥s op"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Kan ikke låse op for krypteret lager med denne adgangskode."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "S_prog"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Tastaturlayout"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formater"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Tastaturlayout"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -554,7 +558,7 @@ msgid "Passphrase can't be empty"
 msgstr "Adgangskoden må ikke være tom"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "Vis adgangskode"
 
@@ -662,78 +666,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Behold filer som er gemt i \"Vedvarende\"-mappen"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Settings on the Welcome Screen"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Language, administration password, and additional settings"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
 msgstr "Browser-bogmærker"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Bogmærker som er gemt i Tor Browser"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Network Connections"
 msgstr "Netværksforbindelser"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Configuration of network devices and connections"
 msgstr "Konfiguration af netværksenheder og forbindelser"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr "Software som er installeret når Tails starter"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr "Printere"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr "Konfiguration af printere"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "Thunderbird e-mails, feeds og indstillinger"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr "GnuPG-nøgleringe og -konfiguration"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr "Bitcoin-klient"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Electrums bitcoin-pung og -konfiguration"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin-profiler og OTR-nøglering"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr "SSH-klient"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr "SSH-nøgler, -konfiguration og kendte værter"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr "Punktumfiler"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 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"
@@ -750,7 +762,7 @@ msgstr "Opsæt vedvarende diskområde i Tails"
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Fejl"
 
@@ -853,7 +865,7 @@ msgid ""
 "{error}"
 msgstr "Kunne ikke importere nøgler fra {path}:\n{error}"
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] "Nøgle importeret"
@@ -861,7 +873,7 @@ msgstr[1] "Nøgler importeret"
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1189,7 +1201,7 @@ msgid ""
 msgstr "\"<b>Der er ikke nok ledig hukommelse til at søge efter opgraderinger.</b>\n\nSørg for at systemet lever op til kravene for at køre Tails.\nSe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPrøv at genstarte Tails for at søge efter opgraderinger igen.\n\nEller foretag en manuel opgradering.\nSe https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "fejl:"
 
@@ -1390,65 +1402,73 @@ msgstr "Kunne ikke tilføje filbeholderen %s: Fik timeout mens der blev ventet p
 msgid "Choose File Container"
 msgstr "Vælg filbeholder"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Vil du virkelig starte den usikre browser?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "Netværksaktivitet i den usikre browser er <b>ikke anonym</b>.\\nAnvend kun den usikre browser hvis det er nødvendigt, f.eks.\\nhvis du skal logge ind eller registrere dig for at aktivere din internetforbindelse."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Starter den usikre browser..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Det kan tage et stykke tid, så vær venligst tålmodig."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Lukker den usikre browser..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Det kan tage et stykke tid, og du må ikke genstarte den usikre browser før den er lukket ordentligt."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Kunne ikke genstarte Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Usikker browser"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Der kører en anden usikker browser kører eller den ryddes op. Prøv igen om lidt tid."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Kunne ikke opsætte chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Kunne ikke konfigurere browseren."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Der blev ikke indhentet nogen DNS-server gennem DHCP eller konfigureret manuelt i NetworkManager."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Kunne ikke køre browser."
 
@@ -1541,7 +1561,7 @@ msgstr "Der kræves autentifikation for at fjerne en pakke fra dine yderligere s
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Administrationsadgangskode"
 
@@ -1565,7 +1585,7 @@ msgid "Disable"
 msgstr "Deaktivér"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "MAC-adresse spoofing"
 
@@ -1586,7 +1606,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Spoof ikke MAC-adresser"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Netværkskonfiguration"
 
@@ -1609,52 +1629,81 @@ msgstr "Konfigurer en Tor-bro eller lokal proxy"
 msgid "Disable all networking"
 msgstr "Deaktivér al netværk"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Du kan konfigurere Tor-broen og lokal proxy senere efter der er oprettet forbindelse til et netværk."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Velkommen til Tails!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Sprog og region"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Standardindstillinger"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Krypteret _vedvarende lager"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Indtast din adgangskode for at låse op for det vedvarende lager"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Dit vedvarende lager er låst op. Genstart Tails for at låse det igen."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Yderligere indstillinger"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Tilføj en yderligere indstilling"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "Standardindstillingerne er sikre i de fleste situationer. Tryk på \"+\"-knappen nedenfor, for at tilføje en tilpasset indstilling."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Luk ned"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Start Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Filbeholdere"
diff --git a/de.po b/de.po
index 307dcca06a..699f1b07b4 100644
--- a/de.po
+++ b/de.po
@@ -37,9 +37,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 17:51+0000\n"
-"Last-Translator: Ettore Atalan <atalanttore at googlemail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Anatol <onon at riseup.net>\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgid ""
 msgstr "<h1>Helfen uns Ihren Fehler zu beheben!</h1>\n<p>Lesen Sie <a href=\"%s\">unsere Fehlerberichtanleitung</a>.</p>\n<p><strong>Geben Sie nur soviele persönliche Informationen an,\nwie unbedingt notwendig!</strong></p>\n<h2>Über die Angabe von Email-Adressen</h2>\n<p>\nDie Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren, um das Problem\nzu klären. Dies ist für die große Mehrheit der erhaltenen Berichte notwendig, da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits ist dies eine\nEinladung für böswillige Dritte, wie Ihren Email- oder Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -117,12 +117,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Wollen Sie Electrum trotzdem starten?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Start"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Beenden"
 
@@ -405,52 +405,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -489,26 +493,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -571,7 +575,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -679,78 +683,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -767,7 +779,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Fehler"
 
@@ -870,7 +882,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -878,7 +890,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1206,7 +1218,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "Fehler:"
 
@@ -1407,65 +1419,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Möchten Sie wirklich den unsicheren Browser starten?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "Die Netzwerkaktivität im unsicheren Browser ist <b>nicht anonym</b>.\\nBenutzen Sie den unsicheren Browser nur wenn nötig, z.B. wenn Sie sich einloggen oder registrieren müssen, um Ihre Internetverbindung zu aktivieren."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Unsicherer Browser wird gestartet …"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Dies könnte eine Weile dauern, bitte haben Sie etwas Geduld."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Unsicherer Browser wird beendet…"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Dies könnte eine Weile dauern, und bevor der unsichere Browser geschlossen ist, können Sie ihn nicht noch einmal starten."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Tor konnte nicht neu gestartet werden."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Unsicherer Browser"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Ein anderer Unsicherer Browser ist derzeit offen oder wird gerade gesäubert. Bitte versuchen Sie es später noch einmal."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Konnte chroot nicht einrichten."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Konfiguration des Browsers fehlgeschlagen."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Konnte keinen DNS-Server über DHCP oder aus den manuellen Einstellungen der Netzwerkverwaltung abrufen."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Starten des Browsers fehlgeschlagen."
 
@@ -1558,7 +1578,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1582,7 +1602,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1603,7 +1623,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1626,52 +1646,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/el.po b/el.po
index 1ff935dd0a..45d86e25e0 100644
--- a/el.po
+++ b/el.po
@@ -28,9 +28,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +64,7 @@ msgid ""
 msgstr "<h1>Βοηθήστε μας να διορθώσουμε το σφάλμα!</h1>\n<p>Διαβάστε <a href=\"%s\">τις οδηγίες μας σχετικά με την αναφορά σφάλματος</a>.</p>\n<p><strong>Μην συμπεριλαμβάνετε περισσότερες προσωπικές πληροφορίες από ότι\nχρειάζεται!</strong></p>\n<h2>Σχετικά με τη διεύθυνση email σας</h2>\n<p>\nΔίνοντάς μας μια διεύθυνση email μας επιτρέπετε να επικοινωνήσουμε μαζί σας για διασαφήνιση του προβλήματος. Αυτό \nχρειάζεται για τη συντριπτική πλειοψηφία των αναφορών που λαμβάνουμε καθώς οι περισσότερες αναφορές \nείναι άχρηστες χωρίς κάποια πληροφορία για επικοινωνία. Από την άλλη πλε
 υρά, αυτό δίνει ευκαιρία \nσε ωτακουστές, όπως τον πάροχο e-mail σας ή τον πάροχο Internet, να \nεπιβεβαιώσουν ότι χρησιμοποιείτε Tails. \n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -108,12 +108,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Θέλετε να εκκινήσετε το Electrum ούτως ή άλλως;"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Εκκίνηση"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Έξοδος"
 
@@ -396,52 +396,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -480,26 +484,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -562,7 +566,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -670,78 +674,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -758,7 +770,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -861,7 +873,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -869,7 +881,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1197,7 +1209,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "σφάλμα:"
 
@@ -1398,65 +1410,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Θέλετε πραγματικά να ξεκινήσετε τον μη ασφαλή Browser;"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Εκκίνηση του μη ασφαλή Browser..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Αυτό μπορεί να πάρει λίγο χρόνο, παρακαλούμε κάντε υπομονή."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Κλείσιμο του μη ασφαλή Browser..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Αυτό μπορεί να πάρει λίγη ώρα, και δεν πρέπει να επανεκκινήσετε τον μη ασφαλή Browser μέχρι να κλείσει μόνος του σωστά."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Αποτυχία επανεκκίνησης του Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Μη ασφαλής Browser"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Ένας άλλος Μη-Ασφαλής Browser εκτελείται αυτή τη στιγμή, ή του γίνεται εκκαθάριση. Παρακαλώ δοκιμάστε ξανά σε λίγο."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Αποτυχία ρύθμισης chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Αποτυχία ρύθμισης του browser."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Δεν αποκτήθηκε DNS server μέσω DHCP ή μέσω χειροκίνητης ρύθμισης στο NetworkManager."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Αποτυχία εκτέλεησης του browser."
 
@@ -1549,7 +1569,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1594,7 +1614,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1617,52 +1637,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/en_GB.po b/en_GB.po
index 8aa7f65938..990913331f 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +47,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -91,12 +91,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -379,52 +379,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -463,26 +467,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -545,7 +549,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -653,78 +657,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -741,7 +753,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -844,7 +856,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -852,7 +864,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1180,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1381,65 +1393,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1532,7 +1552,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1556,7 +1576,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1577,7 +1597,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1600,52 +1620,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/eo.po b/eo.po
index e0015c1ec7..9307534327 100644
--- a/eo.po
+++ b/eo.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1177,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1378,65 +1390,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1529,7 +1549,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1597,52 +1617,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/es.po b/es.po
index 4171c537e6..74e1d3dc5d 100644
--- a/es.po
+++ b/es.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 16:42+0000\n"
-"Last-Translator: eulalio barbero espinosa <eulaliob at gmail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\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"
@@ -54,7 +54,7 @@ msgid ""
 msgstr "<h1>¡Ayúdanos a solucionar tu problema!<h1>\n<p>Lee <a href=\"%s\">nuestras instrucciones para informar de errores</a>.</p>\n<p><strong>¡No incluyas más información personal que \nla imprescindible!</strong></p>\n<h2>Acerca de dar tu dirección de correo electrónico</h2>\n<p>\nDanos una dirección de correo electrónico que nos permita contactar contigo para aclarar el problema. Esto es necesario para la mayoría de los reportes\nque recibimos, ya que el grueso de los que no incluyen información de contacto\nson inútiles. Por otra parte, también ofrece una oportunidad a los fisgones, como tu \nproveedor de correo electrónico o de Internet, para confirmar que estás usando Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Software Adicional"
@@ -98,12 +98,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "¿Quieres iniciar Electrum de todas formas?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Iniciar"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Salir"
 
@@ -386,54 +386,58 @@ msgstr "Añadir"
 msgid "Back"
 msgstr "Volver"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr " _Contraseña de administración"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "_Falseamiento de dirección MAC "
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "Conexión de _red"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Directa (predeterminado)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Puente y proxy"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Desconectado"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Activada (predeterminado)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Activado"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Desactivado"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr " Desactivada (predeterminado) "
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Cerrar"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Iniciar Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -470,28 +474,28 @@ msgstr "umount falló con un código de retorno {returncode}\n{stdout}\n{stderr}
 msgid "Unlocking…"
 msgstr "Desbloqueando..."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "No se puede desbloquear el almacenamiento cifrado con esta frase-contraseña."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Idioma"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Configuración del teclado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formatos"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Configuración del teclado"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -552,7 +556,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "Mostrar contraseña"
 
@@ -660,78 +664,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -748,7 +760,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Error"
 
@@ -851,7 +863,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -859,7 +871,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1187,7 +1199,7 @@ msgid ""
 msgstr "<b>No hay suficiente memoria disponible para comprobar las actualizaciones.</b>\n\nAsegúrate de que el sistema cumple con los requisitos para ejecutar Tails.\nLee file:///usr/share/doc/tails/website/doc/about/requirements.es.html\n\nIntenta reiniciar Tails para comprobar las actualizaciones de nuevo.\n\nO realiza una actualización manual.\nLee https://tails.boum.org/doc/first_steps/upgrade#manual"
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "error:"
 
@@ -1388,65 +1400,73 @@ msgstr "No se pudo agregar el contenedor de archivos%s: Tiempo de espera de la c
 msgid "Choose File Container"
 msgstr "Selecciona contenedor de archivo"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "¿De veras quieres iniciar el Navegador No Seguro?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "La actividad de red con un navegador inseguro <b>no es anónima</b>.\\nÚsalo sólo si es necesario, por ejemplo\\nsi tienes que iniciar sesión o registrarte para activar tu conexión a internet."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Iniciando el Navegador No Seguro..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Esto puede llevar un tiempo, por favor ten paciencia."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Cerrando el Navegador No Seguro..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Esto puede llevar un tiempo, y no podrás reiniciar el Navegador No Seguro hasta que se haya cerrado adecuadamente."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Fallo al reiniciar Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Navegador No Seguro"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "En este momento se está ejecutando o apagando otro Navegador No Seguro. Inténtalo de nuevo en un rato."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Fallo al establecer chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Fallo al configurar el navegador."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "No se obtuvo ningún servidor DNS a través de DHCP o configurado manualmente en el Administrador de Red (NetworkManager)."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Falló al iniciar el navegador."
 
@@ -1539,7 +1559,7 @@ msgstr "Se requiere autenticación para quitar un paquete de su software adicion
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Contraseña de administración"
 
@@ -1563,7 +1583,7 @@ msgid "Disable"
 msgstr "Deshabilitar"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "Falseamiento de dirección MAC"
 
@@ -1584,7 +1604,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "No falsear direcciones MAC"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Configuración de la red"
 
@@ -1607,52 +1627,81 @@ msgstr "Configura un puente Tor o un proxy local"
 msgid "Disable all networking"
 msgstr "Deshabilitar todas las conexiones de red "
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Configurarás el puente de Tor y un proxy local posteriormente, tras conectar a la red."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "¡Bienvenido a Tails!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Idioma y región"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Configuración predeterminada"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Almacenamiento _Persistente Cifrado"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Introduce tu frase contraseña para desbloquear el almacenamiento persistente"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Tu almacenamiento persistente está desbloqueado. Reinicia Tails para volver a bloquearlo."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Configuración adicional"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Añadir una configuración adicional"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "La configuración predeterminada es segura en la mayoría de los casos. Para añadir una configuración personalizada, pulsa debajo el botón \"+\". "
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Cerrar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Iniciar Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Contenedores de archivos"
diff --git a/es_AR.po b/es_AR.po
index 57d4a93857..e05efeef0a 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +51,7 @@ msgid ""
 msgstr "<h1>¡Ayudanos a arreglar errores!</h1>\n<p>Leé <a href=\"%s\">nuestras instrucciones sobre cómo reportar errores</a>.</p>\n<p><strong>¡No incluyas más información personal que la mínima necesaria!</strong></p>\n<h2>Acerca de proporcionarnos una dirección de correo electrónico</h2>\n<p>\nEl proporcionarnos una dirección de correo electrónico nos permite contactarte para clarificar el problema. Esto\nes necesario en la gran mayoría de los reportes que recibimos, ya que muchos de ellos,\nsin alguna información de contacto, son inútiles. Por otro lado, esto permite a un observador hostil, como tu proveedor de correo electrónico o de Internet,\nconfirmar que estás utilizando Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Programas adicionales"
@@ -95,12 +95,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "¿Deseás utizar Electrum de todos modos?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Iniciar"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Salir"
 
@@ -383,52 +383,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -467,26 +471,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -549,7 +553,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -657,78 +661,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -745,7 +757,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Error"
 
@@ -848,7 +860,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -856,7 +868,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1184,7 +1196,7 @@ msgid ""
 msgstr "\"<b>No hay suficiente memoria disponible para comprobar nuevas versiones.</b>\n\nAsegurate que éste sistema satisface los requerimientos para correr Tails.\nMirá file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nIntentá reiniciar Tails para comprobar nuevamente por actualizaciones.\n\nO hacé una actualización manual.\nMirá https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "error:"
 
@@ -1385,65 +1397,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr "Elegir contenedor de archivo"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "¿Realmente querés iniciar el Navegador Inseguro?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "Toda actividad de red dentro del Navegador Inseguro <b>no es anónima</b>.\\nUtilizá el Navegador Inseguro únicamente cuando sea necesario, por ejemplo\\nsi tenés que iniciar sesión o registrarte para activar tu conexión a Internet."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Iniciando el Navegador Inseguro..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Esto puede tomar un tiempo, por favor sé paciente."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Cerrando el Navegador Inseguro..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Esto puede tomar un tiempo, y no podrás reiniciar el Navegador Inseguro hasta que esté cerrado apropiadamente."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Falla al reiniciar Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Navegador Inseguro"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Otro Navegador Inseguro está corriendo, o siendo cerrado. Por favor intentá más tarde."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Falla al configurar nuevo directorio raíz."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Falla al configurar Navegador."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "No hemos obtenido un servidor DNS por medio de DHCP o configurado manualmente en NetworkManager."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Falla al ejecutar el Navegador."
 
@@ -1536,7 +1556,7 @@ msgstr "Se requiere autenticación para remover un paquete de tus programas adic
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1560,7 +1580,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1581,7 +1601,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1604,52 +1624,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Contenedores de archivo"
diff --git a/es_MX.po b/es_MX.po
index e516d318bf..be1328b542 100644
--- a/es_MX.po
+++ b/es_MX.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/et.po b/et.po
index 7a7cf5ea63..99ea588eb0 100644
--- a/et.po
+++ b/et.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/eu.po b/eu.po
index 09b4fc74a7..03d87a39de 100644
--- a/eu.po
+++ b/eu.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -94,12 +94,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -382,52 +382,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -466,26 +470,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -548,7 +552,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -656,78 +660,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -744,7 +756,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -847,7 +859,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -855,7 +867,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1183,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1384,65 +1396,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1535,7 +1555,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1559,7 +1579,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1580,7 +1600,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1603,52 +1623,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/fa.po b/fa.po
index de3008513f..eb664c3c2c 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Hamid reza Zaefarani\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"
@@ -72,7 +72,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -116,12 +116,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -404,52 +404,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -488,26 +492,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -570,7 +574,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -678,78 +682,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -766,7 +778,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -869,7 +881,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -877,7 +889,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1205,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1406,65 +1418,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1557,7 +1577,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1581,7 +1601,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1602,7 +1622,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1625,52 +1645,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/fi.po b/fi.po
index 6a375375b8..9186d56122 100644
--- a/fi.po
+++ b/fi.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +53,7 @@ msgid ""
 msgstr "<h1>Auta meitä korjaamaan löytämäsi virheen!</h1>\n<p>Lue <a href=\"%s\">vikailmoitusohjeemme</a>.</p>\n<p><strong>Älä sisällytä henkilökohtaisia tietoja enempää kuin välttämätöntä!</strong></p>\n<h2>Sähköpostiosoitteen antamisesta meille</h2>\n<p>\nAntamalla meille sähköpostiosoitteen sallit meidän ottaa yhteyttä pulman selvittämiseksi. Tätä tarvitaan sillä ilmoitusten valtava enemmistö on ilman yhteystietoja hyödyttömiä. Toisaalta se myös tarjoaa mahdollisuuden salakuunteluun, kuten sähköposti- tai Internet-tarjoajallesi, vahvistaa, että käytät Tails-ohjelmaa.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -97,12 +97,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Haluatko silti käynnistää Electrum-sovelluksen?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Käynnistä"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Lopeta"
 
@@ -385,52 +385,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -469,26 +473,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -551,7 +555,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -659,78 +663,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -747,7 +759,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Virhe"
 
@@ -850,7 +862,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -858,7 +870,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1186,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "virhe:"
 
@@ -1387,65 +1399,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Haluatko varmasti käynnistää turvattoman selaimen?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Käynnistetään turvaton selain..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Tämä voi kestää hetken, odota rauhassa."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Suljetaan turvaton selain..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Tämä saattaa kestää hetkisen, ja et saa käynnistää turvatonta webbiselainta uudelleen, kunnes se on suljettu oikein."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Torin uudelleenkäynnistys epäonnistui."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Turvaton selain"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Toinen turvaton webbiselain on käynnissä, tai sitä ollaan sulkemassa. Yritä uudelleen hetken kuluttua."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Chroot-asennus epäonnistui."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Selaimen asettaminen epäonnistui."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "DHCP:stä tai manuaalisesti asetetusta Verkkohallinnasta ei saatu DNS-palvelinta."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Selaimen suorittaminen epäonnistui."
 
@@ -1538,7 +1558,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1562,7 +1582,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1583,7 +1603,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1606,52 +1626,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/fr.po b/fr.po
index 4e33ac9e70..235c33bc54 100644
--- a/fr.po
+++ b/fr.po
@@ -40,8 +40,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-26 13:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: AO <ao at localizationlab.org>\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgid ""
 msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\n<p>Lisez <a href=\"%s\">nos instructions de rapport de bogue</a>.</p>\n<p><strong>N’incluez pas plus d’informations personnelles que nécessaire !</strong></p>\n<h2>Nous donner une adresse courriel</h2>\n<p>\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Logiciels additionnels"
@@ -120,12 +120,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Voulez-vous quand même démarrer Electrum ?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Lancer"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Quitter"
 
@@ -408,54 +408,58 @@ msgstr "Ajouter"
 msgid "Back"
 msgstr "Précédent"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Mot de passe d’administration"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "_Usurpation d’adresse MAC"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "Connexion _réseau"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Directe (par défaut)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Pont et mandataire"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Activé (par défaut)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Activé"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Désactivé"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Désactivé (par défaut)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Éteindre"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Démarrer Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -492,28 +496,28 @@ msgstr "umount a échoué avec le code de retour {returncode} :\n{stdout}\n{std
 msgid "Unlocking…"
 msgstr "Déverrouillage…"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Déverrouiller"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Cette phrase de passe ne permet pas de déverrouiller le stockage chiffré."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Langue"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "Disposition du _clavier"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formats"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "Disposition du _clavier"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -574,7 +578,7 @@ msgid "Passphrase can't be empty"
 msgstr "La phrase de passe ne peut pas être vide"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "Afficher la phrase de passe"
 
@@ -682,78 +686,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Conserver les fichiers stockés dans le répertoire `Persistent’"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Settings on the Welcome Screen"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Language, administration password, and additional settings"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
 msgstr "Marque-pages du navigateur"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Marque-pages enregistrés dans le Navigateur Tor"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Network Connections"
 msgstr "Connexions réseau"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Configuration of network devices and connections"
 msgstr "Configuration des périphériques du réseau et connexions"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr "Logiciels installés lors du démarrage de Tails"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr "Imprimantes"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr "Configuration des imprimantes"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "Courriels, flux et paramètres de Thunderbird"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr "Trousseaux et configuration de GnuPG"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr "Client Bitcoin"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Porte-monnaie Bitcoin et configuration d’Electrum"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr "Profils Pidgin et trousseau OTR"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr "Client SSH"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr "Clés, configuration et hôtes connus SSH"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr "Dotfiles"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 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'"
@@ -770,7 +782,7 @@ msgstr "Configurer le volume persistant de Tails"
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Erreur"
 
@@ -873,7 +885,7 @@ msgid ""
 "{error}"
 msgstr "Échec d’importation des clés de {path} :\n{error}"
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] "La clé a été importée"
@@ -881,7 +893,7 @@ msgstr[1] "Les clés ont été importées"
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1209,7 +1221,7 @@ msgid ""
 msgstr "\"<b>Il n’y a pas assez de mémoire disponible pour vérifier les mises à jour.</b>\n\nAssurez-vous que cet ordinateur satisfait les conditions requises pour utiliser Tails.\nVoir file:///usr/share/doc/tails/website/doc/about/requirements.fr.html\n\nEssayez de redémarrer Tails pour vérifier à nouveau les mises à jour.\n\nOu effectuez une mise à jour manuelle.\nVoir https://tails.boum.org/doc/first_steps/upgrade/index.fr.html#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "erreur :"
 
@@ -1410,65 +1422,73 @@ msgstr "Impossible d’ajouter le fichier conteneur %s : délai d’attente dé
 msgid "Choose File Container"
 msgstr "Choisir un fichier conteneur"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Voulez-vous vraiment lancer le navigateur non sécurisé ?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "L’activité réseau dans le navigateur non sécurisé n’est <b>pas anonyme</b>.\\nN’utilisez le navigateur non sécurisé que si nécessaire, par exemple\\nsi vous devez vous identifier ou vous inscrire pour activer votre connexion Internet."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Démarrage du navigateur non sécurisé…"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Cela peut prendre du temps, merci de patienter."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Fermeture du navigateur non sécurisé…"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Cela peut prendre du temps et vous ne devez pas redémarrer le navigateur non sécurisé avant sa fermeture complète."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Échec du redémarrage de Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Navigateur non sécurisé"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Un autre navigateur non sécurisé est en cours d’utilisation, ou est en train d’être nettoyé. Veuillez réessayer dans un moment."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Échec d’exécution de chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Échec de configuration du navigateur."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Aucun serveur DNS n’a été obtenu par le DHCP ou n’est configuré manuellement dans le gestionnaire de réseau."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Échec de démarrage du navigateur."
 
@@ -1561,7 +1581,7 @@ msgstr "Une authentification est nécessaire pour enlever un paquet depuis vos l
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Mot de passe d’administration"
 
@@ -1585,7 +1605,7 @@ msgid "Disable"
 msgstr "Désactiver"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "Usurpation d’adresse MAC"
 
@@ -1606,7 +1626,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Ne pas usurper les adresses MAC"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Configuration du réseau"
 
@@ -1629,52 +1649,81 @@ msgstr "Configurer un pont Tor ou un mandataire local"
 msgid "Disable all networking"
 msgstr "Désactiver le réseau"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Vous configurerez le pont Tor et le mandataire local plus tard, après vous être connecté à un réseau."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Bienvenue dans Tails !"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Langue et région"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Paramètres par défaut"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "_Stockage persistant chiffré"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Saisir votre phrase de passe pour déverrouiller le stockage persistant"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Votre stockage persistant est déverrouillé. Redémarrez Tails pour le verrouiller à nouveau."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Paramètres supplémentaires"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Ajouter un paramètre supplémentaire"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "Les paramètres par défaut sont sûrs dans la plupart des cas. Pour ajouter un paramètre personnalisé, appuyer sur le bouton \"+\" ci-dessous."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Éteindre"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Démarrer Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Fichiers conteneurs"
diff --git a/fy.po b/fy.po
index be2e581a87..533d9b756f 100644
--- a/fy.po
+++ b/fy.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1177,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1378,65 +1390,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1529,7 +1549,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1597,52 +1617,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ga.po b/ga.po
index 8162dfa89c..0089f7dccd 100644
--- a/ga.po
+++ b/ga.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr "<h1>Cabhraigh linn an fhadhb a réiteach!</h1>\n<p>Léigh <a href=\"%s\">conas a chuirtear tuairisc ar fhabht faoinár mbráid</a>.</p>\n<p>Ná cuir an iomarca sonraí pearsanta sa tuairisc!</strong></p>\n<h2>Maidir le seoladh ríomhphoist a sholáthar</h2>\n<p>\nMá thugann tú seoladh ríomhphoist dúinn, beimid in ann dul i dteagmháil leat chun an fhadhb a shoiléiriú. Tá tuilleadh mionsonraí de dhíth i bhformhór mór na gcásanna agus is minic nach féidir linn aon tairbhe a bhaint as tuairisc gan sonraí teagmhála. É sin ráite, tugann sé deis do chúléisteoirí, mar shampla do sholáthraí seirbhíse Idirlín nó do sholáthraí ríomhphoist, deimhniú go n-úsáideann tú Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Bogearraí Breise"
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "An bhfuil fonn ort Electrum a thosú mar sin féin?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Tosaigh"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Scoir"
 
@@ -377,54 +377,58 @@ msgstr "Nua"
 msgid "Back"
 msgstr "Siar"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "Foc_al Faire Riaracháin"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "Bréagsheoltaí _MAC"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "Cea_ngal Líonra"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Díreach (réamhshocrú)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Droichead agus Seachfhreastalaí"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "As líne"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Ar siúl (réamhshocrú)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Ar siúl"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Múchta"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Múchta (réamhshocrú)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Múch"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "To_saigh Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -461,28 +465,28 @@ msgstr "Theip ar umount leis an gcód {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlocking…"
 msgstr "Á dhíghlasáil..."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Díghlasáil"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Ní féidir an stóras criptithe a dhíghlasáil leis an bhfrása faire seo."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Teanga"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Leagan Amach an Mhéarchláir"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formáidí"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Leagan Amach an Mhéarchláir"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Earráid"
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -853,7 +865,7 @@ msgstr[4] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1184,7 +1196,7 @@ msgid ""
 msgstr "\"<b>Níl go leor cuimhne agat le nuashonruithe a lorg.</b>\n\nBa chóir duit deimhniú go gcomhlíonann an córas seo na riachtanais chun Tails a úsáid.\nFéach file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nAtosaigh Tails agus bain triail eile as.\n\nNó déan nuashonrú de láimh.\nFéach https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "earráid:"
 
@@ -1385,65 +1397,73 @@ msgstr "Níorbh fhéidir coimeádán %s a chur leis: Thar am agus ag fanacht le
 msgid "Choose File Container"
 msgstr "Roghnaigh Coimeádán"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an Brabhsálaí Neamhshlán a thosú?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "<b>Ní cheileann</b> gníomhaíocht líonra sa mBrabhsálaí Neamhshlán d'aitheantas. Ná húsáid an Brabhsálaí Neamhshlán mura bhfuil sé go hiomlán riachtanach, mar shampla, más gá duit logáil isteach nó clárú chun ceangal Idirlín a bhunú."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "An brabhsálaí neamhshlán á thosú..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Seans go dtógfaidh sé seo tamall, fan nóiméad."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "An brabhsálaí neamhshlán á dhúnadh..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Seans go dtógfaidh sé seo tamall, agus ní bheidh tú in ann an brabhsálaí neamhshlán a thosú arís go dtí go mbeidh sé dúnta mar is ceart."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Níorbh fhéidir Tor a atosú"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Brabhsálaí Neamhshlán"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Tá brabhsálaí neamhshlán eile ar siúl, nó á dhúnadh, faoi láthair. Déan iarracht eile ar ball."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Theip ar shocrú chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Níorbh fhéidir an brabhsálaí a chumrú."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Ní bhfuarthas freastalaí DNS trí DHCP agus ní raibh sé cumraithe de láimh i mBainisteoir an Líonra."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Níorbh fhéidir an brabhsálaí a thosú."
 
@@ -1536,7 +1556,7 @@ msgstr "Caithfidh tú d'fhocal faire a thabhairt chun pacáiste de na bogearraí
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Focal Faire Riaracháin"
 
@@ -1560,7 +1580,7 @@ msgid "Disable"
 msgstr "Díchumasaigh"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "Bréagsheoltaí MAC"
 
@@ -1581,7 +1601,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Ná húsáid bréagsheoltaí MAC riamh"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Cumraíocht Líonra"
 
@@ -1604,52 +1624,81 @@ msgstr "Cumraigh droichead Tor nó seachfhreastalaí áitiúil"
 msgid "Disable all networking"
 msgstr "Díchumasaigh an líonra go hiomlán"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Cumróidh tú an droichead Tor agus an seachfhreastalaí áitiúil ar ball, tar éis duit ceangal a bhunú le líonra."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Fáilte go Tails!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Teanga agus Réigiún"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Réamhshocruithe"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Stóras _Seasmhach Criptithe"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Cuir isteach an frása faire chun an stóras seasmhach a dhíghlasáil"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Tá an stóras seasmhach díghlasáilte. Atosaigh Tails lena chur faoi ghlas arís."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Socruithe Breise"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Cuir socrú breise leis"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "Tá na réamhshocruithe slán an chuid is mó den am. Brúigh an cnaipe \"+\" thíos le do shocrú féin a chur leis."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Múch"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "To_saigh Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Coimeádáin"
diff --git a/gd.po b/gd.po
index d5acde9a17..223bcf4831 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+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"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1180,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1381,65 +1393,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1532,7 +1552,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1556,7 +1576,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1577,7 +1597,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1600,52 +1620,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/gl.po b/gl.po
index 4d52daaf76..c6d83538ed 100644
--- a/gl.po
+++ b/gl.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Oscar Guardiola <Oscar.Guardiola at davinci-ti.es>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -90,12 +90,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -378,52 +378,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -462,26 +466,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -544,7 +548,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -652,78 +656,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -740,7 +752,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -843,7 +855,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -851,7 +863,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1179,7 +1191,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1380,65 +1392,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1531,7 +1551,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1555,7 +1575,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1576,7 +1596,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1599,52 +1619,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/gu.po b/gu.po
index c3d4196c4e..abce46590f 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/he.po b/he.po
index bc8818a9a2..2438855468 100644
--- a/he.po
+++ b/he.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-20 11:41+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid ""
 msgstr "<h1>עזור לנו לתקן את התקל שלך!</h1>\n<p>קרא את<a href=\"%s\">הוראות דיווח התקלים שלנו</a>.</p>\n<p><strong>אל תכלול מידע אישי יותר מהצורך!</strong></p>\n<h2>לגבי נתינת כתובת דוא״ל לנו</h2>\n<p>\nנתינת כתובת דוא״ל לנו מתירה לנו ליצור איתך קשר כדי להבהיר את הבעיה.\nזה נחוץ לרוב המכריע של הדיווחים שאנחנו מקבלים בעוד מרבית הדיווחים ללא כל מידע יצירת קשר הם חסרי תועלת. מצד שני, זה גם מספק הזדמנות למצותתים, כמו ספק האינטרנט או ספק הדוא״ל שלך לאשר שאתה משתמש ב־Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -95,12 +95,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "האם אתה רוצה להפעיל את Electrum בכל זאת?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_הפעל"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_צא"
 
@@ -383,52 +383,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -467,26 +471,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr "מבטל נעילה…"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -549,7 +553,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "הראה ביטוי סיסמה"
 
@@ -657,78 +661,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -745,7 +757,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "שגיאה"
 
@@ -848,7 +860,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -858,7 +870,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1188,7 +1200,7 @@ msgid ""
 msgstr "\"<b>אין מספיק זיכרון זמין כדי לבדוק אחר שדרוגים.</b>\n\nוודא שמערכת זו עומדת בדרישות להרצת Tails.\nראה file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nנסה להפעיל מחדש את Tails כדי לבדוק שוב אחר שדרוגים.\n\nאו בצע שדרוג ידני.\nראה https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "שגיאה:"
 
@@ -1389,65 +1401,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "האם אתה באמת רוצה להפעיל את הדפדפן הבלתי־בטוח?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "פעילות רשת בתוך הדפדפן הבלתי בטוח <b>אינה אלמונית</b>. השתמש בדפדפן הבלתי בטוח רק אם הכרחי, לדוגמה, אם אתה חייב להיכנס או להירשם כדי לשפעל את חיבור האינטרנט שלך."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "מתחיל את הדפדפן הבלתי בטוח…"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "זה עשוי לקחת זמן מה, אז הייה סבלני."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "מכבה את הדפדפן הבלתי בטוח…"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "זה עשוי לקחת זמן מה ועליך לא להפעיל מחדש את הדפדפן הבלתי־בטוח עד שהוא לא יכובה כראוי."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "נכשל בהפעלת Tor מחדש."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "דפדפן בלתי־בטוח"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "דפדפן בלתי־בטוח אחר רץ כרגע או שהוא מתנקה. אנא נסה שוב עוד מעט."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "נכשל בהתקנת chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "נכשל בתיצור הדפדפן."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "לא הושג שרת DNS דרך DHCP או שהוא לא תוצר באופן ידני במנהל הרשתות."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "נכשל בהרצת הדפדפן."
 
@@ -1540,7 +1560,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1564,7 +1584,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1585,7 +1605,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1608,52 +1628,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/hi.po b/hi.po
index a1e4c19bb8..77e234c9ba 100644
--- a/hi.po
+++ b/hi.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/hr.po b/hr.po
index a4d44659b1..b516101d05 100644
--- a/hr.po
+++ b/hr.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: milotype <mail at milotype.de>\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +46,7 @@ msgid ""
 msgstr "<h1>Pomogni nam  riješiti tvoj problem!</h1>\n<p>Pročitaj <a href=\"%s\">naše upute za prijavu problema</a>.</p>\n<p><strong>Ne uključuj više osobnih podataka nego što je\npotrebno!</strong></p>\n<h2>O davanju email adrese</h2>\n<p>\nDavanje email adrese nam omogućava da te kontaktiramo i razjasnimo problem.\nTo je potrebno za veliku većinu prijava koje zaprimamo, jer je većina prijava bez\nkontakt podataka beskorisna. Imaj na umu da ovo omogućuje prisluškivače, \nkao što su tvoj pružatelj email ili internet usluge, kako bi potvrdili da koristiš Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Dodatni programi"
@@ -90,12 +90,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Želiš li svejedno pokrenuti Electrum?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Pokreni"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Izađi"
 
@@ -378,54 +378,58 @@ msgstr "Dodaj"
 msgid "Back"
 msgstr "Natrag"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Administratorska lozinka"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "_Maskiranje MAC adrese"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "_Mrežna veza"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Direktno (standardno)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Most i proxy"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Izvanmrežno"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Uključeno (standardno)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Uključeno"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Isključeno"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Isključeno (standardno)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Gašenje"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Pokreni Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -462,28 +466,28 @@ msgstr "Umount nije uspio s povratnim kodom {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlocking…"
 msgstr "Otključavanje …"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Otključaj"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Nije moguće otključati šifrirano spremište s ovom lozinkom."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Jezik"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Raspored tipkovnice"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formati"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Raspored tipkovnice"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -544,7 +548,7 @@ msgid "Passphrase can't be empty"
 msgstr "Lozinka ne može biti prazna"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "Pokaži lozinku"
 
@@ -652,78 +656,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Zadrži datoteke spremljene u „trajnom” direktoriju"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Settings on the Welcome Screen"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Language, administration password, and additional settings"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
 msgstr "Zabilješke preglednika"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Zabilješke spremljene u Tor pregledniku"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Network Connections"
 msgstr "Mrežne veze"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Configuration of network devices and connections"
 msgstr "Postavke mrežnih uređaja i veza"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr "Programi instalirani kad se Tails pokreće"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr "Pisači"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr "Konfiguracija pisača"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "E-pošta, feedovi i postavke Thunderbirda"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr "GnuPG skupovi ključeva i postavke"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr "Bitcoin klijent"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Electrum bitcoin lisnica i postavke"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profili i OTR prsten ključeva"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr "SSH klijent"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr "SSH ključevi, postavke i poznati domaćini"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr "Dotfiles"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 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"
@@ -740,7 +752,7 @@ msgstr "Postavi Tails trajni pogon"
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Greška"
 
@@ -843,7 +855,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -852,7 +864,7 @@ msgstr[2] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1181,7 +1193,7 @@ msgid ""
 msgstr "„Nema dovoljno memorije za provjeru nadogradnji.\n\nProvjeri, zadovoljava li ovaj sustav zahtjeve za pokretanje Tailsa.\nPogledaj file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPokušaj ponovo pokrenuti Tails za ponovnu provjeru nadogradnji.\n\nIli nadogradi ručno.\nPogledajte https://tails.boum.org/doc/first_steps/upgrade#manual”"
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "greška:"
 
@@ -1382,65 +1394,73 @@ msgstr "Neuspjelo dodavanje spremnika %s: Vrijeme je isteklo prilikom čekanja n
 msgid "Choose File Container"
 msgstr "Odaberi spremnik datoteka"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Stvarno želiš pokrenuti nesiguran preglednik?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "Mrežna aktivnost unutar nesigurnog Tor preglednika <b>nije anonimna</b>.\\nKoristi nesiguran preglednik samo ako je to potrebno, npr.\\nako se moraš prijaviti ili registrirati za aktiviranje internetske veze."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Pokretanje nesigurnog preglednika …"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Ovo može potrajati, malo se strpi."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Gašenje nesigurnog preglednika …"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Ovo može potrajati. Ne možeš ponovo pokrenuti nesiguran preglednik dok se nije potpuno ugasio. "
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Neuspješno ponovno pokretanje Tora."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Nesiguran preglednik"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Trenutačno radi ili se čisti jedan drugi nesiguran preglednik. Pokušaj ponovo malo kasnije."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Neuspjelo postavljanje chroot. "
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Neuspjelo konfiguriranje preglednika."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Nijedan DNS poslužitelj nije dobavljen kroz DHCP niti ručno konfiguriran u upravljaču mreža."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Neuspjelo pokretanje preglednika."
 
@@ -1533,7 +1553,7 @@ msgstr "Za uklanjanje paketa iz dodatnog softvera ($(command_line)) potrebna ja
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Administratorska lozinka"
 
@@ -1557,7 +1577,7 @@ msgid "Disable"
 msgstr "Deaktiviraj"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "Maskiranje MAC adrese"
 
@@ -1578,7 +1598,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Ne maskiraj MAC adrese"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Mrežna konfiguracija"
 
@@ -1601,52 +1621,81 @@ msgstr "Konfiguriraj Tor most ili lokalni proxy"
 msgid "Disable all networking"
 msgstr "Deaktiviraj sav mrežni rad"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Konfigurirat ćeš Tor most i lokalni proxy kasnije, nakon spajanja na mrežu."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Dobrodošli u Tails!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Jezik i regija"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Standardne postavke"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Šifrirano _trajno spremište"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Upiši lozinku za otključavanje trajnog spremišta"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Tvoje trajno spremište je otključano. Ponovo pokreni Tails kako bi opet bilo zaključano."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Dodatne postavke"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Dodaj jednu dodatnu postavku"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "Standardne postavke su sigurne u većini slučajeva. Za dodavanje prilagođene postavke, pritisni gumb „+”."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Gašenje"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Pokreni Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Datotečni kontejneri"
diff --git a/hu.po b/hu.po
index 3f9c9bafe6..b7479f383b 100644
--- a/hu.po
+++ b/hu.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +52,7 @@ msgid ""
 msgstr "<h1>Segítsen kijavítani a hibát!</h1>\n<p>Olvasd el <a href=\"%s\">hibabejelentési útmutató</a>.</p>\n<p><strong>Kérjük a szükségesnél több személyes információt ne adjon meg!</strong></p>\n<h2>Az email címed megadásáról</h2>\n<p>\nHa megadja nekünk az email címét, fel tudjuk venni a kapcsolatot a probléma tisztázásához. Az esetek többségében ez a legtöbb hibabejelentéshez szükséges, nélküle nem tudunk segíteni a hibaelhárításban.\n\nViszont ez lehetővé teszi egy harmadik fél részére, pl. internet- vagy email szolgáltató, hogy tudomást szerezzen arról, hogy esetenként proxy átjárókat használ az interneteléréshez.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "További szoftverek"
@@ -96,12 +96,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Mindenképp el szeretné indítani az Electum-ot?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Indítás"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Kilépés"
 
@@ -384,54 +384,58 @@ msgstr "Hozzáad"
 msgid "Back"
 msgstr "Vissza"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Adminisztrációs jelszó"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "_MAC cím hamisítás"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "_Hálózati kapcsolat"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Közvetlen (alapértelmezett)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Híd és proxy"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Offline"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Be (alapértelmezett)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Be"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Ki"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Ki (alapértelmezett)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Leállítás"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Tails indítása"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -468,28 +472,28 @@ msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlocking…"
 msgstr "Feloldás..."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Feloldás"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "A titkosított tároló nem dekódolható ezzel a jelszóval."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Nyelv"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Billentyűzet kiosztás"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formátumok"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Billentyűzet kiosztás"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -550,7 +554,7 @@ msgid "Passphrase can't be empty"
 msgstr "A jelszó nem lehet üres"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "Jelmondat megjelenítése"
 
@@ -658,78 +662,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "A fájlok tárolása a 'Tartós' könyvtárban"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Settings on the Welcome Screen"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Language, administration password, and additional settings"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
 msgstr "Böngésző könyvjelzők"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Könyvjelzők elmentve a Tor Böngészőben."
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Network Connections"
 msgstr "Hálózati kapcsolatok"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Configuration of network devices and connections"
 msgstr "Hálózati eszközök és kapcsolatok beállítása"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr "A Tails indulásakor telepített szoftverek"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr "Nyomtatók"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr "Nyomtatók konfigurálása"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "Thunderbird emailek, feedek és beállítások"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr "GnuPG kulcstárolók és konfiguráció"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr "Bitcoin kliens"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Electum bitcoin tárca és konfiguráció"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profilok és OTR kulcstár"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr "SSH kliens"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr "SSH kulcsok, konfiguráció és ismert számítógépek"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr "Dot-fájlok"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 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"
@@ -746,7 +758,7 @@ msgstr "Tails tartós kötet telepítése"
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Hiba"
 
@@ -849,7 +861,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -857,7 +869,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1185,7 +1197,7 @@ msgid ""
 msgstr "\"<b>Not enough memory available to check for upgrades.</b>\n\nEllenőrizze, hogy a rendszere kielégíti-e a Tails futtatásához szükséges követelményeket.\nLásd file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPróbálja meg újraindítani a Tails-t, hogy ismét ellenőrizze a frissítéseket.\n\nVagy végezzen egy manuális frissítést.\nLásd https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "hiba:"
 
@@ -1386,65 +1398,73 @@ msgstr "Nem hozzáadható a fájl konténer %s: Időtúllépés a loop telepít
 msgid "Choose File Container"
 msgstr "Válasszon fájl konténert"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Biztosan el akarja indítani az Unsafe Browser-t?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "A hálózati aktivitás az Unsafe Browser-en keresztül <b>nem titkosítva</b> történik. Csak akkor használja az Unsafe Browser-t ha mindenképp szüksége van rá, pl. az internet kapcsolat aktiválásakor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Az Unsafe Browser indítása..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Ez eltarthat egy ideig, kérjük legyen türelemmel."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Az Unsafe Browser leállítása..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Ez eltarthat egy ideig, és addig nem indíthatja újra az Unsafe Browser-t amíg az megfelelően le nem állt."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Nem sikerült a Tor újraindítása."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Unsafe Browser"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Jelenleg egy másik példánya is fut az Unsafe Browser-nek, vagy épp tisztítás folyamata zajlik. Kérjük térjen vissza később."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "A chroot beállítása sikertelen."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "A böngésző beállítása sikertelen."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Nincs elérhető DNS szerver DHCP-n keresztül, vagy manuálisan van beállítva a hálózatkezelőben."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "A böngésző indítása sikertelen."
 
@@ -1537,7 +1557,7 @@ msgstr "Azonosítás szükséges a további szoftverei közül egy csomag eltáv
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Adminisztrátori jelszó"
 
@@ -1561,7 +1581,7 @@ msgid "Disable"
 msgstr "Kikapcsol"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "MAC cím hamisítás"
 
@@ -1582,7 +1602,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Ne hamisítsa a MAC címeket"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Hálózati konfiguráció"
 
@@ -1605,52 +1625,81 @@ msgstr "Tor híd vagy helyi proxy beállítása"
 msgid "Disable all networking"
 msgstr "Összes hálózati kapcsolat letiltása"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "A Tor hidat és a helyi proxy-t később tudja beállítani, miután csatlakozott a hálózatra."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Köszöntjük a Tails-ben!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Nyelv és régió"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Alapbeállítások"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Titkosított _Tartós tár"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Adja meg a jelszavát a tartóstár feloldásához"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "A tartós tára nyitva. Indítsa újra a Tails-t a visszazárásához."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_További beállítások"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Tovább beállítások hozzá adása"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "Az alapértelmezett beállítások biztonságosak a legtöbb helyzetben. Az egyéni beállítások hozzáadásához nyomja meg a \"+\" gombot alább."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Leállítás"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Tails indítása"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Fájl konténerek"
diff --git a/hy.po b/hy.po
index 38111acae1..08ac39372a 100644
--- a/hy.po
+++ b/hy.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1177,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1378,65 +1390,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1529,7 +1549,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1597,52 +1617,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ia.po b/ia.po
index 096468750d..0861167157 100644
--- a/ia.po
+++ b/ia.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/id.po b/id.po
index ed930f9863..ef821d00d2 100644
--- a/id.po
+++ b/id.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Yosef Yudharso <yudharso at yahoo.ca>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,7 +58,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -102,12 +102,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Apakah Anda tetap ingin memulai Electrum?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Luncurkan"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Keluar"
 
@@ -390,52 +390,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -474,26 +478,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -556,7 +560,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -664,78 +668,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -752,7 +764,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -855,14 +867,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1189,7 +1201,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1390,65 +1402,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1541,7 +1561,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1565,7 +1585,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1586,7 +1606,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1609,52 +1629,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/is.po b/is.po
index 9d96a44458..1630b9a32a 100644
--- a/is.po
+++ b/is.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Sveinn í Felli <sv1 at fellsnet.is>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1177,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1378,65 +1390,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1529,7 +1549,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1597,52 +1617,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/it.po b/it.po
index 4caf20b555..3aebac6338 100644
--- a/it.po
+++ b/it.po
@@ -33,9 +33,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:41+0000\n"
-"Last-Translator: Random_R\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +69,7 @@ msgid ""
 msgstr "<h1>Aiutaci a risolvere il bug!</h1>\n<p>Leggi <a href=\"%s\">le istruzioni per la segnalazione di un bug</a>.</p>\n<p><strong>Non pubblicare informazioni personali che non siano strettamente necessarie!</strong></p>\n<h2>Comunicarci il tuo indirizzo email</h2>\n<p>\nComunicarci il tuo indirizzo email ci permette di contattarti per chiarire il problema. Questo si rende necessario per la maggior parte dei report che riceviamo; i report senza riferimenti per un contatto diretto sono generalmente inutili.\nAllo stesso tempo permette a chiunque sia in ascolto illecitamente, come il tuo provider di internet o email, di dedurre che stai usando Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Software aggiuntivo"
@@ -113,12 +113,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Vuoi comunque avviare Electrum?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Avvia"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Esci"
 
@@ -401,54 +401,58 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Password di amministratore"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "Spoofing indirizzo _MAC"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "_Connessioni di rete"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Diretta (predefinito)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "On (predefinito)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "On"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Off"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Off (predefinito)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -485,26 +489,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -567,7 +571,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -675,78 +679,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -763,7 +775,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Errore"
 
@@ -866,7 +878,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -874,7 +886,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1202,7 +1214,7 @@ msgid ""
 msgstr "\"<b>Memoria insufficiente per controllare gli aggiornamenti.</b>\n\nAssicurati che questo sistema soddisfi i requisiti per usare Tails.\nVedi file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProva a riavviare Tails per controllare di nuovo gli aggiornamenti.\n\nOppure fai un aggiornamento manuale.\nVedi https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "errore:"
 
@@ -1403,65 +1415,73 @@ msgstr "Impossibile aggiungere contenitore file %s: tempo scaduto in attesa del
 msgid "Choose File Container"
 msgstr "Scegli contenitore di file"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Si desidera davvero avviare il browser non sicuro?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "L'attività di rete all'interno del Browser Non Sicuro <b>non è anonima</b>.\\nUtilizza il Browser Non Sicuro solo quando necessario, ad esempio\\nper fare un login o registrarsi per attivare la propria connessione Internet."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Avvio del browser non sicuro..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Questa operazione potrebbe richiedere del tempo."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Arresto del browser non sicuro..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Questa operazione potrebbe richiedere del tempo: non riavviare il browser non sicuro finchè non viene arrestato correttamente."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Riavvio di Tor fallito."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Browser non sicuro"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Un altro browser non sicuro è già in esecuzione, o sta venendo ripulito. Riprovare più tardi."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Configurazione chroot fallita."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Configurazione del browser fallita."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Nessun server DNS ottenuto attraverso DHCP o configurato manualmente nel NetworkManager."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Esecuzione del browser fallita."
 
@@ -1554,7 +1574,7 @@ msgstr "È richiesta l'autenticazione per rimuovere un pacchetto dai tuoi softwa
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1578,7 +1598,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1599,7 +1619,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Configurazione di rete"
 
@@ -1622,52 +1642,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Inserisci la tua passphrase per sbloccare il volume persistente"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Il tuo volume persistente è sbloccato. Riavvia Tails per ribloccarlo."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Impostazioni aggiuntive"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "Le impostazioni predefinite vanno bene nella maggior parte dei casi. Per aggiungere un'impostazione personale, premi il pulsante \"+\" sotto."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Contenitori di file"
diff --git a/ja.po b/ja.po
index 2147969c4d..f04310fe54 100644
--- a/ja.po
+++ b/ja.po
@@ -30,9 +30,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-25 11:12+0000\n"
-"Last-Translator: Ito Takeshi\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +66,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -110,12 +110,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -398,52 +398,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -482,26 +486,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -564,7 +568,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -672,78 +676,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -760,7 +772,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -863,14 +875,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1197,7 +1209,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1398,65 +1410,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1549,7 +1569,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1594,7 +1614,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1617,52 +1637,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ka.po b/ka.po
index 1a7aa45ee4..90f11fb7d8 100644
--- a/ka.po
+++ b/ka.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-20 09:10+0000\n"
-"Last-Translator: Georgianization\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -90,12 +90,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -378,52 +378,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -462,26 +466,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -544,7 +548,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -652,78 +656,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -740,7 +752,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -843,7 +855,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -851,7 +863,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1179,7 +1191,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1380,65 +1392,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1531,7 +1551,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1555,7 +1575,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1576,7 +1596,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1599,52 +1619,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/kab.po b/kab.po
index 9dd4b307cb..1e2a52c357 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Kabyle (http://www.transifex.com/otf/torproject/language/kab/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/kk.po b/kk.po
index 7afbb39676..ffa8c4f283 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/km.po b/km.po
index d4a1efbbc1..9c5cfbafe8 100644
--- a/km.po
+++ b/km.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "ចាប់ផ្ដើម"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "ចេញ"
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "កំហុស"
 
@@ -842,14 +854,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "កំហុស៖"
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "តើ​អ្នក​ពិតជា​ចង់​ចាប់ផ្ដើម​កម្មវិធី​គ្មាន​សុវត្ថិភាព​មែន​ឬ?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "កំពុង​ចាប់ផ្ដើម​កម្មវិធី​គ្មាន​សុវត្ថិភាព..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "វា​អាច​ប្រើ​ពេល​មួយ​រយៈ ដូច្នេះ​សូម​មេត្តា​អត់ធ្មត់។"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "កំពុង​បិទ​កម្មវិធី​អ៊ីនធឺណិត​គ្មាន​សុវត្ថិភាព..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "វា​អាច​ប្រើ​ពេល​មួយ​រយៈ ដូច្នេះ​អ្នក​មិន​ត្រូវ​ចាប់ផ្ដើម​កម្មវិធី​អ៊ីនធឺណិត​គ្មាន​សុវត្ថិភាព​ឡើងវិញ​ឡើយ រហូតដល់​វា​បាន​បិទ​ដោយ​ត្រឹមត្រូវ។"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម Tor ។"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "កម្មវិធី​អ៊ីនធឺណិត​គ្មាន​សុវត្ថិភាព"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "កម្មវិធី​អ៊ីនធឺណិត​គ្មាន​សុវត្ថិភាព​ផ្សេង​បច្ចុប្បន្ន​កំពុង​​ដំណើរការ ឬ​កំពុង​ត្រូវ​បាន​សម្អាត។ សូម​ព្យាយាម​ម្ដងទៀត​នៅ​ពេល​បន្ទាប់។"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំឡើង chroot ។"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "មិន​បាន​ទទួល​ម៉ាស៊ីន​មេ DNS តាម DHCP ឬ​តាម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ដោយ​ដៃ​នៅ​ក្នុង​កម្មវិធី​គ្រប់គ្រង​បណ្ដាញ។"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/kn.po b/kn.po
index 014c9b9434..6b39efeedb 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1177,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1378,65 +1390,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1529,7 +1549,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1597,52 +1617,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ko.po b/ko.po
index 3cf748eb19..a4430635e4 100644
--- a/ko.po
+++ b/ko.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +51,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -95,12 +95,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -383,52 +383,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -467,26 +471,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -549,7 +553,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -657,78 +661,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -745,7 +757,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -848,14 +860,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1182,7 +1194,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1383,65 +1395,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1534,7 +1554,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1558,7 +1578,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1579,7 +1599,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1602,52 +1622,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/lt.po b/lt.po
index b58e3a560d..046c10b5a1 100644
--- a/lt.po
+++ b/lt.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Moo\n"
 "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Papildoma programinė įranga"
@@ -90,12 +90,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Ar vis tiek norite paleisti Electrum?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -378,54 +378,58 @@ msgstr "PridÄ—ti"
 msgid "Back"
 msgstr "Atgal"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Administravimo slaptažodis"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "_MAC adresų klastojimas"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "Ti_nklo ryšys"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Įjungta"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "IÅ¡jungta"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "Palei_sti Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -462,28 +466,28 @@ msgstr ""
 msgid "Unlocking…"
 msgstr "Atrakinama…"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Atrakinti"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "Ka_lba"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Klaviatūros išdėstymas"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formatai"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Klaviatūros išdėstymas"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -544,7 +548,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -652,78 +656,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -740,7 +752,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Klaida"
 
@@ -843,7 +855,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -853,7 +865,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1183,7 +1195,7 @@ msgid ""
 msgstr "\"<b>Naujinimų tikrinimui nepakanka prieinamos atminties.</b>\n\nĮsitikinkite, kad ši sistema tenkina Tails paleidimo reikalavimus.\nŽiūrėkite file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nNorėdami dar kartą tikrinti naujinimus, pabandykite paleisti Tails iš naujo.\n\nArba atlikite naujinimą rankiniu būdu.\nŽiūrėkite https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "klaida:"
 
@@ -1384,65 +1396,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Ar tikrai norite paleisti nesaugią naršyklę?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Paleidžiama nesaugi naršyklė..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Nepavyko iš naujo paleisti Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Nesaugi naršyklė"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Nepavyko sukonfigūruoti naršyklės."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Nepavyko paleisti naršyklės."
 
@@ -1535,7 +1555,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1559,7 +1579,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1580,7 +1600,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1603,52 +1623,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "Palei_sti Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/lv.po b/lv.po
index 6fa1c55622..6e00789f79 100644
--- a/lv.po
+++ b/lv.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -851,7 +863,7 @@ msgstr[2] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1180,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1381,65 +1393,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1532,7 +1552,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1556,7 +1576,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1577,7 +1597,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1600,52 +1620,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/mk.po b/mk.po
index 2d8fe57626..382f5dbfd6 100644
--- a/mk.po
+++ b/mk.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-19 01:23+0000\n"
-"Last-Translator: Zarko Gjurov <zarkogjurov at gmail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Liljana Ackovska <liljanagjurova at gmail.com>\n"
 "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +47,7 @@ msgid ""
 msgstr "<h1>Помогнете ни да ја поправиме вашата грешка!</h1>\n<p>Прочитајте ги <a href=\"%s\">нашите инструкции за пријавување на грешка</a>.</p>\n<p><strong>Не вклучувај лични информации повеќе отколку што е потребно!</strong></p>\n<h2>За да ни дадете адреса за е-пошта</h2>\n<p>\nСо давањето на адреса за е-пошта ни овозможувате да ве контактираме за да го појасниме проблемот. Ова\nе потребно за огромното мнозинство на извештаи кои ги добиваме а најголемиот број на извештаи\nбез информации за контакт се бескорисни. Од друга страна тоа исто така им дава\nможност на прислушувачите,
  како вашата е-пошта или Интернет провајдерот, да\nпотврдат дека користите Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Дополнителен софтвер"
@@ -91,12 +91,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Дали сепак сакаш да го стартуваш Electrum?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Лансирање"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Излез"
 
@@ -379,54 +379,58 @@ msgstr "Додади"
 msgid "Back"
 msgstr "Назад"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Администраторска Лозинка"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "_Спуфирање на MAC адреса"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "_Мрежно поврзување"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Директно (стандардно)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Мост и Прокси"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Офлајн/Исклучен"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Уклучено (Стандардно)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Уклучено"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Исклучено"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Исклучено (Стандардно)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Исклучување"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Стартување на Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -463,28 +467,28 @@ msgstr "демонтирањето не успеа со повратен код
 msgid "Unlocking…"
 msgstr "Отклучување..."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Отклучи"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Не може да се отклучи енкриптираниот скалд со оваа лозинка"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Јазик"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Распоред на тастатура"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Формати"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Распоред на тастатура"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -545,7 +549,7 @@ msgid "Passphrase can't be empty"
 msgstr "Полето за лозинка не може да биде празно"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "Покажи лозинка"
 
@@ -653,78 +657,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Чувај ги датотеките складирани во `Постојаниот' директориум"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Settings on the Welcome Screen"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Language, administration password, and additional settings"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
 msgstr "Облежувачи на прелистувачот"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Обележувачите се зачувани во Tor прелистувачот"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Network Connections"
 msgstr "Поврзување на мрежа"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Configuration of network devices and connections"
 msgstr "Конфигурирање на мрежните уреди и поврзувања"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr "Софтверот е инсталиран кога Tails е стартуван"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr "Печатачи"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr "Конфигурирање на печатачи"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "Thunderbird е-пошти, тековници, и поставки"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr "GnuPG привезоци и конфигурација"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr "Биткоин клиент"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Биткоин паричник и конфигурирање на Electrum"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin профили и OTR привезок"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr "SSH клиент"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr "SSH клучеви, конфигурација и познати хостови"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr "Дотдатотеки"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr "Symlink во $HOME секоја датотека или директориум пронајдени во `дотдатотеки' директориумот"
@@ -741,7 +753,7 @@ msgstr "Поставување на постојан простор на Tails"
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Грешка"
 
@@ -844,7 +856,7 @@ msgid ""
 "{error}"
 msgstr "Не успеа увезувањето на клучеви од {path}:\n{error}"
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] "Клучот е увезен"
@@ -852,7 +864,7 @@ msgstr[1] "Клучевите се увезени"
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1180,7 +1192,7 @@ msgid ""
 msgstr "\"<b>Нема доволно достапна меморија за проверка за надградби.</b>\n\nБидете сигурни дека овој систем ги задоволува барањата за работење на Tails.\nВидете file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nОбидете се повторно да го стартувате Tails за повторно да проверите за надградби.\n\nИли направете рачна надградба.\nВидете https://tails.boum.org/doc/first_steps/upgrade#manual\"  "
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "грешка:"
 
@@ -1381,65 +1393,73 @@ msgstr "Не можеше да биде додадена контејнер да
 msgid "Choose File Container"
 msgstr "Избери контејнер датотека"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Дали навистина сакаш да стартуваш Небезбеден прелистувач?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "Мрежната активност помеѓу Небезбедниот прелистувач е <b>не анонимна</b>.\\nНебезбедниот прелистувач користете го само ако е неопходно, како на пример\\nако треба да се најавите или регистрирате за да го активирате вашето Интернет поврзување."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Стартување на Небезбеден прелистувач..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Ова може да потрае, ве молиме бидете трпеливи."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Исклучување на Небезбедниот прелистувач..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Ова може да потрае, и не треба повторно да го стартувате Небезбедниот прелистувач се додека не е правилно исклучен."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Tor не се стартуваше повторно."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Небезбеден прелистувач"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Друг Небезбеден прелистувач работи во мометов, или е исчистен. Ве молиме обидете се подоцна."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Не беше поставен chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Прелистувачот не се конфигурираше."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "DNS сервери не беа пронајдени преку DHCP или не беа рачно конфигурирани во МрежниотМенаџер."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Прелистувачот не се стартуваше."
 
@@ -1532,7 +1552,7 @@ msgstr "Автентикацијата е потребна за да се отс
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Администраторска лозинка"
 
@@ -1556,7 +1576,7 @@ msgid "Disable"
 msgstr "Оневозможи"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "Спуфинг на MAC адреса"
 
@@ -1577,7 +1597,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Не ги имитирај MAC адресите"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Конфигурирање на мрежа"
 
@@ -1600,52 +1620,81 @@ msgstr "Конфигурирај Tor мост или локално прокси
 msgid "Disable all networking"
 msgstr "Оневозможување на целата мрежа"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Ќе го конфигирирате Tor мостот и локалното прокси подоцна откако ќе се поврзете на мрежа."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Добредојдовте во Tails!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Јазик и Регион"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Основни поставки"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Енкриптиран_Постојан склад"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Внесете ја вашата лозинка за да го отклучите постојаниот склад"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Вашиот постојан скалд е отклучен. Повторно стартувајте го Tails. "
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Дополнителни поставки"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Додади дополнителна поставка"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "Стандардните поставки се безбедни во повеќето ситуации. За да додадете прилагодено поставување, притиснете го \"+\" копчето подолу."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Исклучување"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Стартување на Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Контејнер датотеки"
diff --git a/ml.po b/ml.po
index d52a78968c..edaf39779f 100644
--- a/ml.po
+++ b/ml.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/mr.po b/mr.po
index d982d6b932..1700f5249b 100644
--- a/mr.po
+++ b/mr.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ms_MY.po b/ms_MY.po
index cd46a9ab5f..e15d72e0ed 100644
--- a/ms_MY.po
+++ b/ms_MY.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +47,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -91,12 +91,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -379,52 +379,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -463,26 +467,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -545,7 +549,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -653,78 +657,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -741,7 +753,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -844,14 +856,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/my.po b/my.po
index 3950be943c..51a5f30baf 100644
--- a/my.po
+++ b/my.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,14 +852,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1174,7 +1186,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1375,65 +1387,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1526,7 +1546,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1550,7 +1570,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1571,7 +1591,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1594,52 +1614,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/nb.po b/nb.po
index 9991945560..09194786dc 100644
--- a/nb.po
+++ b/nb.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,7 +58,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -102,12 +102,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -390,52 +390,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -474,26 +478,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -556,7 +560,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -664,78 +668,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -752,7 +764,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -855,7 +867,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -863,7 +875,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1191,7 +1203,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1392,65 +1404,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1543,7 +1563,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1567,7 +1587,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1588,7 +1608,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1611,52 +1631,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ne.po b/ne.po
index ec9b1d1787..3e11e2272c 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Nepali (http://www.transifex.com/otf/torproject/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/nl.po b/nl.po
index 30fbe0aa28..59d10f1194 100644
--- a/nl.po
+++ b/nl.po
@@ -36,9 +36,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-19 11:12+0000\n"
-"Last-Translator: Tonnes <tonnes.mb at gmail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Thomas De Rocker\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,7 +72,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Extra software"
@@ -116,12 +116,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Wilt u Electrum alsnog starten?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Starten"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -404,54 +404,58 @@ msgstr ""
 msgid "Back"
 msgstr "Terug"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "_Netwerkverbinding"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Offline"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Aan"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Uit"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -488,26 +492,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -570,7 +574,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -678,78 +682,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -766,7 +778,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -869,7 +881,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -877,7 +889,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1205,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1406,65 +1418,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1557,7 +1577,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1581,7 +1601,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1602,7 +1622,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Netwerkconfiguratie"
 
@@ -1625,52 +1645,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Bestandscontainers"
diff --git a/nl_BE.po b/nl_BE.po
index cfcf28064e..6f624b4b3b 100644
--- a/nl_BE.po
+++ b/nl_BE.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/nn.po b/nn.po
index 88a6c9885a..707335d13e 100644
--- a/nn.po
+++ b/nn.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/oc.po b/oc.po
index 44e4cf91c1..649cbfa0ff 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+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"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/or.po b/or.po
index cd9744d031..e7c9ade0af 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Oriya (http://www.transifex.com/otf/torproject/language/or/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/pa.po b/pa.po
index bdd1f10474..129035cf62 100644
--- a/pa.po
+++ b/pa.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1177,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1378,65 +1390,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1529,7 +1549,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1597,52 +1617,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/pl.po b/pl.po
index e2caa64ab2..8900e47095 100644
--- a/pl.po
+++ b/pl.po
@@ -26,9 +26,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\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"
@@ -62,7 +62,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -106,12 +106,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -394,52 +394,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -478,26 +482,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -560,7 +564,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -668,78 +672,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -756,7 +768,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -859,7 +871,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -869,7 +881,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1199,7 +1211,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1400,65 +1412,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1551,7 +1571,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1596,7 +1616,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1619,52 +1639,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/pt_BR.po b/pt_BR.po
index f3228675d3..1207400e44 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -33,9 +33,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-19 19:53+0000\n"
-"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad at hotmail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Communia <ameaneantie at riseup.net>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +69,7 @@ msgid ""
 msgstr "<h1>Ajude a consertar o erro que você encontrou!</h1>\n<p>Leia <a href=\"%s\">as instruções de relatórios de erros</a>.</p>\n<p><strong>Não inclua informações pessoais além do necessário!</strong></p>\n<h2>Sobre como nos informar um endereço de e-mail</h2>\n<p>\nSe você informar seu e-mail, podemos fentrar em contato para esclarecer o problema. Isso é necessário na grande maioria dos relatórios que recebemos (muitos deles nos chegam sem informações de contato e são inúteis). No entanto, com um endereço de e-mail, alguém que tenha acesso às suas nformações, como o seu  provedor de e-mail ou de Internet, poderá confirmar que você está usando Tails. </p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -113,12 +113,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Você deseja iniciar o Electrum assim mesmo?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Lançar"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Saída"
 
@@ -401,54 +401,58 @@ msgstr ""
 msgid "Back"
 msgstr "Anterior"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Senha de Administração"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Ponte & Proxy"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Offline"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Encerrar"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -485,28 +489,28 @@ msgstr ""
 msgid "Unlocking…"
 msgstr "Desbloqueando..."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Não foi possível abrir o dispositivo de armazenamento criptografado com esta frase secreta"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Idioma"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Modelo de Teclado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Formatos"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Modelo de Teclado"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -567,7 +571,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -675,78 +679,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -763,7 +775,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Erro"
 
@@ -866,7 +878,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -874,7 +886,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1202,7 +1214,7 @@ msgid ""
 msgstr "\"<b>Não há memória suficiente para procurar por atualizações.</b>\n\nVerifique se o sistema cumpre os requerimentos para executar Tails\nConsulte o documento:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nTente reiniciar Tails para procurar por atualizações novamente\n\nOu faça a atualização manualmente\nConsulte https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "erro:"
 
@@ -1403,65 +1415,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Você realmente deseja iniciar o Navegador não-confiável?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "A atividade de rede no Navegador <b>não é anônima</b>.\\nUse o Navegador Sem Segurança somente se for necessário, por exemplo\\nse você tiver de fazer login ou registrar-se para ativar a sua conexão de Internet."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Iniciando o Navegador não-confiável..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Isto pode demorar um pouco; por favor, seja paciente."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Encerrando o Navegador não-confiável..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Isto pode demorar um pouco e você não poderá reiniciar o Navegador não-confiável até que ele seja encerrado adequadamente."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Falha ao reiniciar o Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Navegador não-confiável"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Um outro Navegador não-confiável está atualmente em execução ou sendo limpo. Por favor, tente novamente mais tarde."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Falha ao configurar chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Falha ao configurar o navegador."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Nenhum provedor de DNS foi obtido através de DHCP ou configurado manualmente no Gerenciamento de Rede."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Falha ao executar o navegador."
 
@@ -1554,7 +1574,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Senha de Administração"
 
@@ -1578,7 +1598,7 @@ msgid "Disable"
 msgstr "Desabilitar"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "_Mascaragem de endereços MAC"
 
@@ -1599,7 +1619,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Não mascarar endereços MAC"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Configuração de Rede"
 
@@ -1622,52 +1642,81 @@ msgstr "Configurar uma ponte Tor ou um proxy local"
 msgid "Disable all networking"
 msgstr "Desativar toda conexão de rede"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Você irá configurar uma ponte Tor e um proxy local após conectar-se a uma rede."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Boas-vindas ao Tails!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Idioma & Região"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Configurações-Padrão"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Criptografado_ Armazenamento Persistente"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Inserir a sua frase secreta para abrir o dispositivo de armazenamento persistente"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "O seu volume de armazenamento persistente está aberto. Reiniciar Tails para bloqueá-lo novamente."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Configurações Adicionais"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Adicionar uma configuração adicional"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "As configurações padrão são seguras na maioria dos casos. Para outras configurações personalizadas, clique na tecla \"+\" abaixo."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Encerrar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/pt_PT.po b/pt_PT.po
index 6a85456707..5bf384eab1 100644
--- a/pt_PT.po
+++ b/pt_PT.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -92,12 +92,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Iniciar"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Sair"
 
@@ -380,52 +380,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -464,26 +468,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -546,7 +550,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -654,78 +658,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -742,7 +754,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Erro"
 
@@ -845,7 +857,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -853,7 +865,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1181,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "erro:"
 
@@ -1382,65 +1394,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Deseja iniciar o Navegador Inseguro?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "A iniciar o Navegador Inseguro..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Isto poderá demorar algum tempo, por favor, seja paciente."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "A encerrar o Navegador Inseguro..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Não foi possível reiniciar o Tor:"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Navegador Inseguro"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Não foi possível configurar o chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1533,7 +1553,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1557,7 +1577,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1578,7 +1598,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1601,52 +1621,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Definições Predefinidas"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "Definições _Adicionais"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Adicionar uma definição adicional"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "As definições predefinidas são seguras na maioria das situações. Para adicionar uma definição personalizada, clique no botão abaixo \"+\"."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ro.po b/ro.po
index ca79b2626d..974ae8647e 100644
--- a/ro.po
+++ b/ro.po
@@ -26,9 +26,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgid ""
 msgstr "<h1>Ajutați-ne sa reparăm erorilel!</h1>\n\n<p>Citește<a href=\"%s\">instrucțiunile de raportare a erorilor</a>.</p>\n\n<p><strong>Nu includeți mai multe informații personale\n\ndecât sunt necesare!</strong></p>\n\n<h2>Despre oferirea unei adrese de email personal</h2>\n\n<p>\n\nTrimiterea adresei de email ne permite sa vă contactăm pentru a clarifica problema. Fără\ndate de contact informația pe care o primim e nefolositoare, deci acest lucru este necesar pentru \nmajoritatea rapoartelor pe care le primim. Pe de altă parte această informație poate confirma \ncuiva care vă urmărește, cum ar fi furnizorii dumneavoastră de Internet și email, \ncă folosiți Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Aplicații adiționale"
@@ -106,12 +106,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Vrei să inițializezi Electrum oricum?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Lansare"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Iesire"
 
@@ -394,52 +394,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -478,26 +482,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -560,7 +564,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -668,78 +672,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -756,7 +768,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Eroare"
 
@@ -859,7 +871,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -868,7 +880,7 @@ msgstr[2] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1197,7 +1209,7 @@ msgid ""
 msgstr "\"<b>Memorie insuficientă pentru verificarea actualizărilor.</b>\n\nAsigurați-vă că sistemul satisface cerințele minime pentru a rula Tails.\nAflați mai multe la file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPuteți încerca să reporniți Tails pentru a verifica din nou actualizările.\n\nPuteți de asemenea să actualizați sistemul manual.\nAflați cum la https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "eroare:"
 
@@ -1398,65 +1410,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr "Alegere Container de Fișiere"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Doriți să lansați Unsafe Browser ? "
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "Activitatea de rețea în Unsafe Browser <b>nu este anonimă</b>.\\n Folosiți Unsafe Browser numai dacă este necesar, de exemplu\\nif trebuie să vă autentificați sau înregistrați pentru activarea conexiunii dvs. la Internet."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Se pornește navigatorul neprotejat Unsafe Browser"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Ar putea dura ceva timp, vă rugăm să aveți putină rabdare. "
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Navigatorul neprotejat Unsafe Browser se închide..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Acest lucru poate dura ceva timp, nu reporniți navigatorul neprotejat Unsafe Browser până ce nu este închis corespunzător."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Tor nu s-a putut reporni. "
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Navigatorul neprotejat Unsafe Browser"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Un alt navigator Unsafe Browser este pornit sau în curs de închidere. Reîncercați în câteva minute."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "A eșuat configurarea chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "A eșuat configurarea navigatorului."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Nu s-a obținut nici un server DNS prin DHCP sau prin configurarea manuală cu administratorul de rețea NetworkManager."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "A eșuat rularea navigatorului."
 
@@ -1549,7 +1569,7 @@ msgstr "Aveți nevoie de autentificare pentru a elimina un pachet din aplicații
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1594,7 +1614,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1617,52 +1637,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Containere de Fișiere"
diff --git a/ru.po b/ru.po
index e7b486ca73..fbdc6a32e8 100644
--- a/ru.po
+++ b/ru.po
@@ -37,9 +37,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Sergey Smirnov <cj75300 at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -117,12 +117,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -405,52 +405,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -489,26 +493,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -571,7 +575,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -679,78 +683,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -767,7 +779,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -870,7 +882,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -880,7 +892,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1210,7 +1222,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1411,65 +1423,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1562,7 +1582,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1586,7 +1606,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1607,7 +1627,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1630,52 +1650,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/si_LK.po b/si_LK.po
index 3edda13acc..e15203b7e2 100644
--- a/si_LK.po
+++ b/si_LK.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sk.po b/sk.po
index 2a5d2dd4d1..0534676c59 100644
--- a/sk.po
+++ b/sk.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Lenka Ježková <lenka.jezkova at oziveni.cz>\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +51,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -95,12 +95,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -383,52 +383,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -467,26 +471,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -549,7 +553,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -657,78 +661,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -745,7 +757,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -848,7 +860,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -858,7 +870,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1188,7 +1200,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1389,65 +1401,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1540,7 +1560,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1564,7 +1584,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1585,7 +1605,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1608,52 +1628,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sl.po b/sl.po
index 5bc632eb7c..facc81e64b 100644
--- a/sl.po
+++ b/sl.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Å tefan Baebler <stefan.baebler at gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -851,7 +863,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1181,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1382,65 +1394,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1533,7 +1553,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1557,7 +1577,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1578,7 +1598,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1601,52 +1621,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/son.po b/son.po
index 9a9ff4cf31..ea646cd86d 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Songhay (http://www.transifex.com/otf/torproject/language/son/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,14 +852,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1174,7 +1186,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1375,65 +1387,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1526,7 +1546,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1550,7 +1570,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1571,7 +1591,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1594,52 +1614,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sq.po b/sq.po
index 2d3dd099e9..9a49a869e1 100644
--- a/sq.po
+++ b/sq.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Besnik Bleta <besnik at programeshqip.org>\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"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sr.po b/sr.po
index c46475daa7..3dc47fdf24 100644
--- a/sr.po
+++ b/sr.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +47,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -91,12 +91,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -379,52 +379,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -463,26 +467,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -545,7 +549,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -653,78 +657,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -741,7 +753,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -844,7 +856,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -853,7 +865,7 @@ msgstr[2] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1182,7 +1194,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1383,65 +1395,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1534,7 +1554,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1558,7 +1578,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1579,7 +1599,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1602,52 +1622,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sv.po b/sv.po
index 70869bddce..57eb90efae 100644
--- a/sv.po
+++ b/sv.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-24 17:31+0000\n"
-"Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl at gmail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Jonas Franzén\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgid ""
 msgstr "<h1>Hjälp oss att åtgärda ditt fel!</h1>\n<p>Läs <a href=\"%s\">våra instruktioner för att rapportera fel</a>.</p>\n<p><strong>Inkludera inte mer personlig information än nödvändigt!</strong></p>\n<h2>Om att ge oss din e-postadress</h2>\n<p>\nAtt ge oss din e-postadress gör det möjligt för oss att komma i kontakt med dig för att reda ut problemet. Det här är nödvändigt för den stora majoriteten av rapporterna vi tar emot eftersom att de flesta rapporter utan kontaktinformation är oanvändbara. Å andra sidan ger det också en möjlighet för obehöriga, som din e-post- eller Internetleverantör, att bekräfta att du använder Tails.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Extra program"
@@ -104,12 +104,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Vill du starta Electrum ändå?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Starta"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Avsluta"
 
@@ -392,52 +392,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -476,26 +480,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -558,7 +562,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -666,78 +670,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -754,7 +766,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Fel"
 
@@ -857,7 +869,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -865,7 +877,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1193,7 +1205,7 @@ msgid ""
 msgstr "\"<b>Inte tillräckligt tillgängligt minne för att söka efter uppgraderingar.</b>\n\nSäkerställ att det här systemet uppnår systemkraven för att köra Tails.\nSe fil:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nTesta att starta om Tails för att söka efter uppgraderingar igen.\n\nEller gör en manuell uppgradering.\nSe https://tails.boum.org/doc/first_steps/upgrade#manual\""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "fel:"
 
@@ -1394,65 +1406,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr "Välj filbehållare"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Vill du verkligen starta den osäkra webbläsaren?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "Nätverksaktivitet i den osäkra webbläsaren är <b>inte anonymiserad</b>.\\nAnvänd bara den osäkra webbläsaren om det är absolut nödvändigt, till exempel\\nom du måste logga in eller registrera dig för att aktiva din Internet-anslutning."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Startar den osäkra webbläsaren..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Detta kan ta en liten stund, vänligen ha tålamod."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Stänger av den osäkra webbläsaren..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Detta kan ta en liten stund, och den osäkra webbläsaren kan inte startas på nytt förrän den är helt nedstängd."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Det gick inte att starta om Tor."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Osäker webbläsare"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "En annan osäker webbläsare är för närvarande igång eller på väg att stängas av. Vänligen försök igen om en stund."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "Det gick inte att ställa in chroot."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Det gick inte att konfigurera webbläsare."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "Ingen DNS server blev tilldelad genom DHCP eller manuell konfiguration i NetworkManager."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Det gick inte att starta webbläsare."
 
@@ -1545,7 +1565,7 @@ msgstr "Autentisering krävs för att ta bort ett paket från dina extra program
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1569,7 +1589,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1590,7 +1610,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1613,52 +1633,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Filbehållare"
diff --git a/sw.po b/sw.po
index bec751b6b2..86fcb8a77c 100644
--- a/sw.po
+++ b/sw.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-23 20:12+0000\n"
-"Last-Translator: Heldina Mwingira <mwingira.hg at gmail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ta.po b/ta.po
index 715183dac0..e211d5eba3 100644
--- a/ta.po
+++ b/ta.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,7 +854,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -850,7 +862,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1178,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1379,65 +1391,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1530,7 +1550,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/tails.pot b/tails.pot
index 1cd25650f9..453443d32a 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/te.po b/te.po
index 16e8163126..263a93a32c 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: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -848,7 +860,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/th.po b/th.po
index e26be6367a..95c188670f 100644
--- a/th.po
+++ b/th.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: bact' <arthit at gmail.com>\n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +49,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -93,12 +93,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -381,52 +381,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -465,26 +469,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -547,7 +551,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -655,78 +659,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -743,7 +755,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -846,14 +858,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1180,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1381,65 +1393,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1532,7 +1552,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1556,7 +1576,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1577,7 +1597,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1600,52 +1620,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/tr.po b/tr.po
index fa26971aa6..3c3b1ce1f2 100644
--- a/tr.po
+++ b/tr.po
@@ -29,9 +29,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-21 07:26+0000\n"
-"Last-Translator: Kaya Zeren <kayazeren at gmail.com>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\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"
@@ -65,7 +65,7 @@ msgid ""
 msgstr "<h1>Karşılaştığınız sorunu çözmemize yardım edin!</h1>\n<p><a href=\"%s\">Hata bildirme yönergelerini</a> okuyun.</p>\n<p><strong>Gerektiğinden fazla kişisel bilgi vermeyin!</strong></p>\n<h2>E-posta adresinizi bildirmeniz hakkında</h2>\n<p>\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkişi ya da kuruluşlara (e-posta ya da İnternet hizmeti sağlayıcınıza) Tails uygulamasını kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu nedenle farklı bir e-posta adresi kullanmanız önerilir.\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "Ek Uygulamalar"
@@ -109,12 +109,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Electrum yine de başlatılsın mı?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_BaÅŸlat"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "Çı_kış"
 
@@ -397,54 +397,58 @@ msgstr "Ekle"
 msgid "Back"
 msgstr "Geri"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "_Yönetim Parolası"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "_MAC Adresi Yanıltması"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "_Ağ Bağlantısı"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "Doğrudan (varsayılan)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "Köprü ve Vekil Sunucu"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "Açık (varsayılan)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "Açık"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "Kapalı"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "Kapalı (varsayılan)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Kapat"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Tails BaÅŸlat"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -481,28 +485,28 @@ msgstr "umount şu hata kodu ile yürütülemedi {returncode}:\n{stdout}\n{stder
 msgid "Unlocking…"
 msgstr "Kilit açılıyor..."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "Kilidi Aç"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Bu parola ile şifreli depolama alanının kilidi açılamadı."
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "_Dil"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Tuş Takımı Düzeni"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "_Biçimler"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Tuş Takımı Düzeni"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -563,7 +567,7 @@ msgid "Passphrase can't be empty"
 msgstr "Parola boş bırakılamaz"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "Parola Görüntülensin"
 
@@ -671,78 +675,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Dosyalar `Persistent' klasöründe depolansın"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Settings on the Welcome Screen"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Language, administration password, and additional settings"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
 msgstr "Yer İmlerine Göz At"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Tor Browser üzerine kaydedilmiş yer imleri"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Network Connections"
 msgstr "Ağ Bağlantıları"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Configuration of network devices and connections"
 msgstr "Ağ aygıt ve bağlantılarının ayarları"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr "Tails başlatılırken kurulan uygulamalar"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr "Yazıcılar"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr "Yazıcı ayarları"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "Thunderbird e-postalar, akışlar ve ayarlar"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr "GnuPG anahtarlık ve ayarları"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr "Bitcoin Ä°stemcisi"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Electrum bitcoin cüzdanı ve ayarları"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profilleri ve Kayıt Dışı anahtarlığı"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr "SSH Ä°stemcisi"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr "SSH anahtarları, ayarları ve bilinen sunucular"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr "Dotfiles"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 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"
@@ -759,7 +771,7 @@ msgstr "Tails kalıcı depolaması kur"
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "Hata"
 
@@ -862,7 +874,7 @@ msgid ""
 "{error}"
 msgstr "Anahtarlar {path} üzerinden içe aktarılamadı:\n{error}"
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] "Anahtar İçe Aktarıldı"
@@ -870,7 +882,7 @@ msgstr[1] "Anahtarlar İçe Aktarıldı"
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1198,7 +1210,7 @@ msgid ""
 msgstr "\"<b>Güncellemeleri denetlemek için yeterli bellek yok.</b>\n\nSistemin Tails uygulamasını çalıştırmak için gereksinimleri karşıladığından emin olun.\nfile:///usr/share/doc/tails/website/doc/about/requirements.en.html dosyasına bakabilirsiniz\n\nGüncellemeleri yeniden denetlemek için Tails uygulamasını yeniden başlatmayı deneyin.\n\nYa da el ile güncellemeyi deneyin.\nAyrıntılı bilgi almak için https://tails.boum.org/doc/first_steps/upgrade#manual\" adresine bakabilirsiniz"
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "hata:"
 
@@ -1399,65 +1411,73 @@ msgstr "%s dosya kapsayıcısı eklenemedi: Çevrim kurulumu beklenirken zaman a
 msgid "Choose File Container"
 msgstr "Dosya Kapsayıcısını Seçin"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "Güvenli Olmayan Tarayıcıyı başlatmak istediğinize emin misiniz?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "Güvensiz Tarayıcı ile ağ etkinlikleriniz <b>anonim değildir</b>.\\nGüvensiz Tarayıcıyı yalnızca kullanmanız gerekiyorsa, örneğin\\nİnternet bağlantınızı etkinleştirmek için kaydolmanız ya da oturum açmanız gerekiyorsa kullanın."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "Güvenli Olmayan Tarayıcı başlatılıyor..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "Bu işlem biraz zaman alabilir, lütfen sabırlı olun."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "Güvenli Olmayan Tarayıcı kapatılıyor..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "Bu işlem biraz zaman alabilir. Güvenli Olmayan Tarayıcı düzgün kapatılmadan yeniden başlatamayabilirsiniz."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "Tor yeniden başlatılamadı."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "Güvenli Olmayan Tarayıcı"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "Şu anda başka bir Güvenli Olmayan Tarayıcı çalışıyor ya da temizleniyor. Lütfen bir süre sonra yeniden deneyin."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "chroot kurulamadı."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "Tarayıcıyı ayarlanamadı."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "DHCP aracılığıyla bir DNS sunucusu bulunamadı ya da AğYöneticisi içinde el ile ayarlanmış."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "Tarayıcıyı çalıştırılamadı."
 
@@ -1550,7 +1570,7 @@ msgstr "Ek uygulamalarınızdan bir paket kaldırmak için kimlik doğrulaması
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "Yönetici Parolası"
 
@@ -1574,7 +1594,7 @@ msgid "Disable"
 msgstr "Devre Dışı Bırak"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "MAC Adresi Yanıltması"
 
@@ -1595,7 +1615,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "MAC adresleri yanıltılmasın"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "Ağ Yapılandırması"
 
@@ -1618,52 +1638,81 @@ msgstr "Bir Tor köprüsü ya da vekil sunucu yapılandır"
 msgid "Disable all networking"
 msgstr "Tüm ağ devre dışı bırakılsın"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "Bir ağa bağlandıktan sonra Tor köprüsü ya da yerel vekil sunucu yapılandırmasını yapacaksınız."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "Tails Uygulamasına Hoş Geldiniz!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "Dil ve Bölge"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "Varsayılan Ayarlar"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "Şifreli _Kalıcı Depolama"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Kalıcı depolamanın kilidini açmak için parolanızı yazın"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Kalıcı depolama alanının kilidi açıldı. Yeniden kilitlemek için Tails uygulamasını yeniden başlatın."
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "_Ek Ayarlar"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "Ek bir ayar ekle"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "Çoğu durum için varsayılan ayarları kullanmak güvenlidir. Özel bir ayar eklemek için aşağıdaki \"+\" düğmesine tıklayın."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Kapat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Tails BaÅŸlat"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Dosya Kapsayıcıları"
diff --git a/uk.po b/uk.po
index eb8c959486..0e576d6607 100644
--- a/uk.po
+++ b/uk.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +54,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -98,12 +98,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -386,52 +386,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -470,26 +474,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -552,7 +556,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -660,78 +664,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -748,7 +760,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -851,7 +863,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -861,7 +873,7 @@ msgstr[3] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1191,7 +1203,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1392,65 +1404,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1543,7 +1563,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1567,7 +1587,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1588,7 +1608,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1611,52 +1631,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ur.po b/ur.po
index 3b74536abf..c29f7290ca 100644
--- a/ur.po
+++ b/ur.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -376,52 +376,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -738,7 +750,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -841,7 +853,7 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
@@ -849,7 +861,7 @@ msgstr[1] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1177,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1378,65 +1390,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1529,7 +1549,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1597,52 +1617,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/uz.po b/uz.po
index 2350f5bcb5..858a246218 100644
--- a/uz.po
+++ b/uz.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -375,52 +375,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -459,26 +463,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -737,7 +749,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -840,14 +852,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1174,7 +1186,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1375,65 +1387,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1526,7 +1546,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1550,7 +1570,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1571,7 +1591,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1594,52 +1614,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/vi.po b/vi.po
index b4f7e1d6ab..2eff6512ff 100644
--- a/vi.po
+++ b/vi.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -377,52 +377,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -739,7 +751,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -842,14 +854,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1176,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1377,65 +1389,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1528,7 +1548,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1596,52 +1616,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/zh_CN.po b/zh_CN.po
index e44f3a0da0..c1c96038f1 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -34,9 +34,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,7 +70,7 @@ msgid ""
 msgstr "<h1>帮助我们修复您的 bug!</h1>\n<p>阅读<a href=\"%s\">我们的 bug 报告指南</a>。</p>\n<p><strong>不要包含任何不必要的个人信息!</strong></p>\n<h2>关于给我们一个电子邮件地址</h2>\n<p>\n给我们一个电子邮件地址能允许我们联系您以说清问题。这对绝大多数报告都是需要的,我们收到的许多报告都因为没有联系信息而无用。但在另一方面,它也提供了一个窥探的机会,像是您的电子邮件或者互联网提供商,以此确认您正在使用 Tails。\n</p>\n"
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr "附加软件"
@@ -114,12 +114,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "您无论如何都要启动 Electrum 吗?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "启动(_L)"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "退出(_E)"
 
@@ -402,54 +402,58 @@ msgstr "添加"
 msgid "Back"
 msgstr "后退"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr "管理员密码(_A)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr "MAC 地址欺骗(_M)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr "网络连接(_N)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr "直接(默认)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr "网桥和代理"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr "脱机"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "开启(默认)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
 msgid "On"
 msgstr "å¼€"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
 msgid "Off"
 msgstr "å…³"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
 msgid "Off (default)"
 msgstr "关闭(默认)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "关闭"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "启动 Tails(_S)"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -486,28 +490,28 @@ msgstr "挂载失败,返回代码 {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlocking…"
 msgstr "正在解锁…"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr "解锁"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "无法用此密码解锁加密的存储。"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr "语言(_L)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "键盘布局(_K)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
 msgid "_Formats"
 msgstr "格式(_F)"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "键盘布局(_K)"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -568,7 +572,7 @@ msgid "Passphrase can't be empty"
 msgstr "密码不能为空"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr "显示密码"
 
@@ -676,78 +680,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "文件保存至“Persistent”目录"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Settings on the Welcome Screen"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Language, administration password, and additional settings"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
 msgstr "浏览器书签"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "在 Tor 浏览器中保存的书签"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Network Connections"
 msgstr "网络连接"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
 msgid "Configuration of network devices and connections"
 msgstr "配置网络设备和连接"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr "启动 Tails 时安装的软件"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr "打印机"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr "打印机配置"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr "ThunderBird"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr "Thunderbird 邮件,阅读器列表和设置"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr "GnuPG 钥匙环与配置"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr "比特币客户端"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Electrum 的比特币钱包和配置"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin 配置文件及 OTR 钥匙环"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr "SSH 客户端"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr "SSH 密钥,配置及已知服务器"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr "Dotfiles"
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr "将“dotfiles”目录中的所有文件和文件夹连入 $HOME 的符号链接"
@@ -764,7 +776,7 @@ msgstr "设置 Tails 永久卷"
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr "错误"
 
@@ -867,14 +879,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1201,7 +1213,7 @@ msgid ""
 msgstr "<b>内存不足,无法检测更新。</b>\n\n请确保系统满足 Tails 的最低运行要求。参阅文件:file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\n重启再次检测更新。\n\n或者手动更新。\n参阅:https://tails.boum.org/doc/first_steps/upgrade#manual"
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr "错误:"
 
@@ -1402,65 +1414,73 @@ msgstr "无法添加文件容器 %s:等待回环设备时超时。\n请使用
 msgid "Choose File Container"
 msgstr "选择文件容器"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "是否确定启动非安全浏览器?"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr "不安全浏览器中的网络活动<b>不是匿名的</b>。\\n请仅在必要时使用不安全的浏览器,例如,\\n如果您必须用它来登录或注册以激活因特网连接。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr "正在启动非安全浏览器..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr "可能需要一会儿,请稍等。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr "正在关闭非安全浏览器..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "可能需要一会儿。正常关闭之前无法重启非安全浏览器。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr "无法重启 Tor。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr "非安全浏览器"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "另一种不安全的浏览器正在运行,或者正在被清理。请在稍后重试。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr "设置 chroot 失败。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr "配置浏览器失败。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "在网络管理器中没有通过 DHCP 获得或手动配置 DNS 服务器。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr "运行浏览器失败。"
 
@@ -1553,7 +1573,7 @@ msgstr "移除附加软件需要认证 ($(command_line))"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr "管理密码"
 
@@ -1577,7 +1597,7 @@ msgid "Disable"
 msgstr "禁用"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr "MAC 地址欺骗"
 
@@ -1598,7 +1618,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "不欺骗任何 MAC 地址"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr "网络配置"
 
@@ -1621,52 +1641,81 @@ msgstr "配置 Tor 网桥或本地代理"
 msgid "Disable all networking"
 msgstr "禁用所有网络"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr "您将在稍后连接到网络后配置 Tor 网桥和本地代理设置。"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr "欢迎使用 Tails!"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr "语言和区域"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr "默认设置"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr "加密的永久存储(_P)"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "请输入您的密码以解锁永久存储"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "您的永久存储已解锁。重启 Tails 以再次锁定它。"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr "附加设置(_A)"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr "添加一个额外设置"
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr "默认设置在大多数情况下是安全的。要添加自定义设置,点击下面的 + 按钮。"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "关闭"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "启动 Tails(_S)"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "文件容器"
diff --git a/zh_HK.po b/zh_HK.po
index 593c66255c..5278a61279 100644
--- a/zh_HK.po
+++ b/zh_HK.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -92,12 +92,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -380,52 +380,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -464,26 +468,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -546,7 +550,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -654,78 +658,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -742,7 +754,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -845,14 +857,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1179,7 +1191,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1380,65 +1392,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1531,7 +1551,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1555,7 +1575,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1576,7 +1596,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1599,52 +1619,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/zh_TW.po b/zh_TW.po
index 2c779b4de3..971833fe18 100644
--- a/zh_TW.po
+++ b/zh_TW.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2020-06-19 19:37+0200\n"
+"PO-Revision-Date: 2020-06-29 00:35+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,7 +58,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
 #: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
 msgstr ""
@@ -102,12 +102,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:68
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:69
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr ""
 
@@ -390,52 +390,56 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
 msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:183
 msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:246
 msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:255
 msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:257
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
 msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
-msgid "On (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329
+msgid "_Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
-msgid "On"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
-msgid "Off"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
-msgid "Off (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:393
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
+msgid "Off (default)"
 msgstr ""
 
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
@@ -474,26 +478,26 @@ msgstr ""
 msgid "Unlocking…"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:91
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
 msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:96
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
+msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
-msgid "_Formats"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
@@ -556,7 +560,7 @@ msgid "Passphrase can't be empty"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
 msgid "Show Passphrase"
 msgstr ""
 
@@ -664,78 +668,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "Browser Bookmarks"
+msgid "Settings on the Welcome Screen"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
-msgid "Bookmarks saved in the Tor Browser"
+msgid "Language, administration password, and additional settings"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Network Connections"
+msgid "Browser Bookmarks"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
-msgid "Configuration of network devices and connections"
+msgid "Bookmarks saved in the Tor Browser"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Network Connections"
 msgstr ""
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Configuration of network devices and connections"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
 msgid "Software installed when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
 msgid "Printers"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
 msgid "Printers configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Thunderbird"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
 msgid "Thunderbird emails, feeds, and settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
 msgid "GnuPG"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
 msgid "GnuPG keyrings and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
 msgid "Bitcoin Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
 msgid "Pidgin"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
 msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
 msgid "SSH Client"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
 msgid "SSH keys, configuration and known hosts"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
 msgid "Dotfiles"
 msgstr ""
 
-#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr ""
@@ -752,7 +764,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
 #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
 msgid "Error"
 msgstr ""
 
@@ -855,14 +867,14 @@ msgid ""
 "{error}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
 msgid "Key Imported"
 msgid_plural "Keys Imported"
 msgstr[0] ""
 
 #. Translators: Don't translate {uids}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
 #, python-brace-format
 msgid "Imported a key for {uids}"
 msgid_plural "Imported keys for {uids}"
@@ -1189,7 +1201,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
 msgid "error:"
 msgstr ""
 
@@ -1390,65 +1402,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
 msgid "Starting the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
 msgid "Failed to restart Tor."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
 msgid "Unsafe Browser"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
+msgid ""
+"The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want "
+"to use the Unsafe Browser, you have to restart Tails and enable it in the "
+"settings on the Welcome Screen."
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:113
 msgid "Failed to configure browser."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:119
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:130
 msgid "Failed to run browser."
 msgstr ""
 
@@ -1541,7 +1561,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
 msgid "Administration Password"
 msgstr ""
 
@@ -1565,7 +1585,7 @@ msgid "Disable"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
 msgid "MAC Address Spoofing"
 msgstr ""
 
@@ -1586,7 +1606,7 @@ msgid "Don't spoof MAC addresses"
 msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
 msgid "Network Configuration"
 msgstr ""
 
@@ -1609,52 +1629,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
+msgid ""
+"The Unsafe Browser allows you to log in to a captive portal.\n"
+"\n"
+"A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n"
+"\n"
+"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
 msgid ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
 msgid "Language & Region"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
 msgid "Default Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
 msgid "_Additional Settings"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 msgstr ""
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr ""
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""



More information about the tor-commits mailing list