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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
From: translation@xxxxxxxxxxxxxx
Date: Mon, 29 Jun 2020 00:46:14 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 28 Jun 2020 21:08:25 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 1de14546d9dd9079584b4b1aac863dd66bb8f058
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Mon Jun 29 00:46:13 2020 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ach.po    | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 af.po     | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 ar.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 ast.po    | 209 +++++++++++++++++++++++++++++++++++++------------------------
 az.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 be.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 bg.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 bn.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 br.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 bs.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 ca.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 cs.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 cy.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 da.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 de.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 el.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 en_GB.po  | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 eo.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 es.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 es_AR.po  | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 es_MX.po  | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 et.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 eu.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 fa.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 fi.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 fr.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 fy.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 ga.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 gd.po     | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 gl.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 gu.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 he.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 hi.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 hr.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 hu.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 hy.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 ia.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 id.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 is.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 it.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 ja.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 ka.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 kab.po    | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 kk.po     | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 km.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 kn.po     | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 ko.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 lt.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 lv.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 mk.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 ml.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 mr.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 ms_MY.po  | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 my.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 nb.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 ne.po     | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 nl.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 nl_BE.po  | 209 +++++++++++++++++++++++++++++++++++++------------------------
 nn.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 oc.po     | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 or.po     | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 pa.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 pl.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 pt_BR.po  | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 pt_PT.po  | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 ro.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 ru.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 si_LK.po  | 209 +++++++++++++++++++++++++++++++++++++------------------------
 sk.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 sl.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 son.po    | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 sq.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 sr.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 sv.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 sw.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 ta.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 tails.pot | 209 +++++++++++++++++++++++++++++++++++++------------------------
 te.po     | 207 +++++++++++++++++++++++++++++++++++++-----------------------
 th.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 tr.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 uk.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 ur.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 uz.po     | 209 +++++++++++++++++++++++++++++++++++++------------------------
 vi.po     | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 zh_CN.po  | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 zh_HK.po  | 209 +++++++++++++++++++++++++++++++++++++------------------------
 zh_TW.po  | 211 ++++++++++++++++++++++++++++++++++++++------------------------
 87 files changed, 11258 insertions(+), 6995 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 587dd150c1..f67814a04c 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,54 +375,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 f50934f314..1c4772ca42 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@xxxxxxxxx>\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 "<h1>Ø³Ø§Ø¹Ø¯Ù?Ø§ Ù?Ø¥ØµÙ?Ø§Ø Ø§Ù?Ù?Ø´Ù?Ù?Ø©!</h1>\n<p>Ø§Ù?Ø±Ø£ <a href=\"%s\">Ø§Ù?Ø¥Ø±Ø´Ø§Ø¯Ø§Øª Ø§Ù?Ø®Ø§ØµØ© Ø¨Ø§Ù?ØªØ¨Ù?Ù?Øº Ø¹Ù? Ø§Ù?Ø£Ø®Ø·Ø§Ø¡</a>.</p>\n<p><strong>Ù?ØÙ?Ø§Ù?Ø© Ø®ØµÙ?ØµÙ?ØªÙ?Ø? Ø§Ù?Ù?Ø£ Ø§Ù?Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?Ù?Ø·Ù?Ù?Ø¨Ø© Ù?Ù?Ø· Ù?Ø§ ØºÙ?Ø±!</strong></p>\n<h2>ØªÙ?Ø¶Ù?Ø ØÙ?Ù? Ø¥Ø¹Ø·Ø§Ø¦Ù?Ø§ Ø¹Ù?Ù?Ø§Ù? Ø¨Ø±Ù?Ø¯Ù? Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?</h2>\n<p>\nØ³Ù?Ø³ØªØ®Ø¯Ù? Ø¨Ø±Ù?Ø¯Ù? Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ù?Ù?ØªÙ?Ø§ØµÙ? Ù?Ø¹Ù? Ù?Ø§Ø³ØªÙ?Ø¶Ø§Ø Ø§Ù?Ù?Ø´Ù?Ù?Ø© Ø¨Ø´Ù?Ù? Ø£Ù?Ø¶Ù?Ø? Ù?Ù?Ù? Ù?Ø·Ù?Ù?Ø¨ Ù?Ø£ØºÙ?Ø¨ ØªÙ?Ø§Ø±Ù?Ø± Ø§Ù?Ø£Ø®Ø·Ø§Ø¡ ØÙ?Ø« Ø£Ù?Ù? Ù?Ù? ØºÙ?Ø± Ø§Ù?Ù?Ù?Ù?Ù? Ù?ØªØ§Ø¨Ø¹Ø© ØªÙ?Ø§Ø±Ù?Ø± Ø§Ù?Ø£Ø®Ø·Ø§Ø¡ Ø§Ù?ØªÙ? ØªØ±Ø³Ù? Ù?Ù? Ø¯Ù?Ù? Ø£Ù?Ø© Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ø§ØªØµØ§Ù?.\nÙ?Ù? Ù?Ø§ØÙ?Ø© Ø£Ø®Ø±Ù?Ø? Ù?Ø¬Ø¨ Ø§Ù?ØªÙ?Ù?Ù?Ù? Ø¨Ø£Ù? ØªØ¶Ù?Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ù?Ø³Ù?Ø Ù?Ù?Ù?ØªÙ?ØµØªÙ?Ù?Ø? Ù?Ù?Ø²Ù?Ø¯ Ø®Ø¯Ù?Ø© Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø£Ù? Ù?Ø²Ù?Ø¯ Ø®Ø¯Ù?Ø© Ø§Ù?Ø¥Ù?ØªØ±Ù?ØªØ? Ø§Ù?ØªØ£Ù?Ø¯ Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù?Ù? Ù?Ù?ØªÙ?Ù?Ø² . \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 "_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,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 "Ù?Ù?Ù?Ø© Ø§Ù?Ø³Ø± Ù?Ù?Ø£Ø¯Ù?Ù?"
 
-#: 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 "Ø§Ø¨Ø¯Ø£ ØªÙ?Ù?Ø²"
-
 #: 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{s
 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 ""
@@ -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 "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 "ØªÙ?Ù? ØÙ?Ø¸ Ø§Ù?Ø¹Ù?Ø§Ù?Ø© Ø§Ù?Ù?Ø±Ø¬Ø¹Ù?Ø© Ø¨Ù?Ø¬Ø§Ø Ù?Ù? Ù?ØªØµÙ?Ù?Ø ØªÙ?Ø±"
 
-#: 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 "ØªÙ? ØªØ«Ø¨Ù?Øª Ø§Ù?Ø¨Ø±Ø§Ù?Ø¬ Ø¹Ù?Ø¯ Ø¨Ø¯Ø¡ ØªØ´ØºÙ?Ù? ØªÙ?Ù?Ø²"
 
-#: 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 "Ù?ØÙ?Ø¸Ø© Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù? Ù?Ù?Ø¨Ù?ØªÙ?Ù?Ù?Ù? Ù? Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª"
 
-#: 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 keyring"
 
-#: 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 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
@@ -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 "Ù?Ø´Ù?Øª Ø§Ø³ØªÙ?Ø±Ø§Ø¯ Ø§Ù?Ù?Ù?Ø§ØªÙ?Ø Ù?Ù? {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] ""
@@ -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 "</b>Ù?Ø§ ØªØªÙ?Ù?Ø± Ø°Ø§Ù?Ø±Ø© Ù?Ø§Ù?Ù?Ø© Ù?Ù?ØªØÙ?Ù? Ù?Ù? Ù?Ø¬Ù?Ø¯ ØªØ±Ù?Ù?Ø§Øª.</b>\n\nØªØ£Ù?Ø¯ Ù?Ù? Ø£Ù? Ù?Ø°Ø§ Ø§Ù?Ù?Ø¸Ø§Ù? Ù?Ù?Ø¨Ù? Ù?ØªØ·Ù?Ø¨Ø§Øª ØªØ´ØºÙ?Ù? ØªÙ?Ù?Ø².\nØ§Ù?Ø¸Ø± 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 "Ø®Ø·Ø£:"
 
@@ -1412,65 +1424,73 @@ msgstr "ØºÙ?Ø± Ù?Ø§Ø¯Ø± Ø¹Ù?Ù? Ø¥Ø¶Ø§Ù?Ø© ØØ§Ù?Ø¸Ø© Ù?Ù?Ù? %s: Ø§Ù?ØªÙ?Øª Ø§Ù?
 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 "Ù?Ø´Ù?Øª Ù?ØØ§Ù?Ù?Ø© Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙ?Ù? ØªÙ?Ø±."
 
-#: 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 Ø£Ù? Ø¹Ù? Ø·Ø±Ù?Ù? Ø§Ù?Ø§Ø¯Ø®Ø§Ù? Ø§Ù?Ù?Ø¯Ù?Ù? Ù?Ù? 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 "Ø®Ù?Ù? Ù?Ù? ØªØ´ØºÙ?Ù? Ø§Ù?Ù?ØªØµÙ?Ø."
 
@@ -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 "Ø¥Ù?ØªØØ§Ù? Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ù? MAC"
 
@@ -1608,7 +1628,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 "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø´Ø¨Ù?Ø©"
 
@@ -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 "Ø³ØªÙ?Ù?Ù? Ø¨ØªØ¹Ù?Ù?Ù? Ø¬Ø³Ù?Ø± 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 "Ù?Ø±ØØ¨Ø§ Ø¨Ù? Ø¥Ù?Ù? ØªØ§Ù?Ù?Ø² !"
 
-#: ../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 ec8de7003b..d10f5e210e 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,54 +375,58 @@ msgstr "Amestar"
 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 "Sin conexÃ³n"
 
-#: 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 "ActivÃ¡u"
+
+#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 cba38a4653..76a313bd7d 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 "_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 "_Ã?Ä±xÄ±Å?"
 
@@ -376,54 +376,58 @@ msgstr "Æ?lavÉ? et"
 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 ""
 
-#: 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 "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 "Aktivdir"
+
+#: 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 "SÃ¶ndÃ¼r"
-
-#: 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 ""
@@ -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 "Å?ifrÉ? ifadÉ?si boÅ? ola bilmÉ?z"
 
 #: 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 "FayllarÄ± `DavamlÄ±` kataloqda saxla"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "SeÃ§ilmiÅ?lÉ?r Tor BrauzerindÉ? saxlanmÄ±Å?dÄ±r"
 
-#: 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 "Å?É?bÉ?kÉ? Æ?laqÉ?lÉ?ri"
 
-#: 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 "Å?É?bÉ?kÉ? Ã¶tÃ¼rÃ¼cÃ¼sÃ¼ vÉ? É?laqÉ?lÉ?rinin konfiqurasiyasÄ±"
 
-#: 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 ""
 
-#: 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 "PrinterlÉ?r"
 
-#: 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 "Printer konfiqurasiyasÄ±"
 
-#: 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 "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 aÃ§ar Ã¼zÃ¼yÃ¼ vÉ? konfiqurasiyasÄ±"
 
-#: 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 "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 profillÉ?r vÉ? OTR aÃ§ar Ã¼zÃ¼yÃ¼"
 
-#: 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 MÃ¼Å?tÉ?ri"
 
-#: 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 aÃ§arlar, konfiqurasiya vÉ? tanÄ±nan hostlar"
 
-#: 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 "Dotfayllar"
 
-#: 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 "`Dotfayl` kataloqunda tapÄ±lmÄ±Å? hÉ?r fayl vÉ? ya kataloq Symlink $HOME daxilinÉ?"
@@ -738,7 +750,7 @@ msgstr "Tails-in davamlÄ± hÉ?cmini quraÅ?dÄ±r"
 #: 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 "XÉ?ta"
 
@@ -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 "xÉ?ta:"
 
@@ -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 "Buna baxmayaraq TÉ?hlÃ¼kÉ?li Brauzeri aÃ§maq istÉ?yirsÉ?n?"
 
-#: 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 "TÉ?hlÃ¼kÉ?li Brauzerin aÃ§Ä±lmasÄ±..."
 
-#: 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 bir qÉ?dÉ?r vaxt ala bilÉ?r, lÃ¼tfÉ?n, sÉ?brli ol."
 
-#: 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 "TÉ?hlÃ¼kÉ?li Brauzerin baÄ?lanmasÄ±..."
 
-#: 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 bir qÉ?dÉ?r vaxt ala bilÉ?r vÉ? ola bilsin o tam baÄ?lanana qÉ?dÉ?r sÉ?n TÉ?hlÃ¼kÉ?li Brauzeri baÄ?laya bilmÉ?zsÉ?n."
 
-#: 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-un yenidÉ?n baÅ?ladÄ±lmasÄ± alÄ±nmadÄ±."
 
-#: 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 "TÉ?hlÃ¼kÉ?li Brauzer"
 
-#: 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 "DigÉ?r TÉ?hlÃ¼kÉ?li Brauzer hazÄ±rda iÅ?lÉ?yir, ya da tÉ?mizlÉ?nir. LÃ¼tfÉ?n, birazdan yenidÉ?n sÄ±na."
 
-#: 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-un quraÅ?dÄ±rÄ±lmasÄ± alÄ±nmadÄ±."
 
-#: 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 "NÉ? DHCP vasitÉ?silÉ? heÃ§ bir DNS É?ldÉ? edilmÉ?di, nÉ? dÉ? Å?É?bÉ?kÉ?MenecerindÉ? manual olaraq konfiqurasiya edilmÉ?di."
 
-#: 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 "SÃ¶ndÃ¼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 ""
 
@@ -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 "BÃ¼tÃ¼n Å?É?bÉ?kÉ?ni sÃ¶ndÃ¼r"
 
+#: ../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 "SÃ¶ndÃ¼r"
+
+#: ../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 6e024f2168..57763bf681 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,54 +375,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 9f182a2747..4f23817093 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 "<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 ""
@@ -99,12 +99,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 "_Ð?Ð·Ñ?Ð¾Ð´"
 
@@ -387,54 +387,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 ""
@@ -471,28 +475,28 @@ msgstr "umount Ð²Ñ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? ÐºÐ¾Ð´ {returncode}:\n{stdout}\n{stder
 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 ""
@@ -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 "Ð¡Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð²Ð°Ð¹ Ñ?Ð°Ð¹Ð»Ð¾Ð²ÐµÑ?Ðµ Ð² \"Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð°\"(Persistent) Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Ð?Ñ?Ð¼ÐµÑ?ÐºÐ¸Ñ?Ðµ Ñ?Ð° Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸ Ð² 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 "Ð?Ñ?ÐµÐ¶Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ñ?Ñ?Ð·ÐºÐ¸"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Ð?Ð»ÐµÐºÑ?Ñ?Ñ?Ð¼ Ð±Ð¸Ñ?ÐºÐ¾Ð¸Ð½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?ÐµÐ¹Ð» Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ?"
 
-#: 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 "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ð¸Ñ?Ð½Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° Ð² $ HOME Ð²Ñ?ÐµÐºÐ¸ Ñ?Ð°Ð¹Ð» Ð¸Ð»Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ? Ð² Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ? \"dotfiles\""
@@ -749,7 +761,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 "Ð?Ð Ð?Ð¨Ð?Ð?"
 
@@ -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 "\"<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>.\\nÐ?Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹Ñ?Ðµ Ð?ÐµÑ?Ð¸Ð³Ñ?Ñ?ÐµÐ½ Ð?Ñ?Ð°Ñ?Ð·Ñ?Ñ? Ñ?Ð°Ð¼Ð¾\\nif Ð¿Ñ?Ð¸ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾Ñ?Ñ?, Ð½Ð°Ð¿Ñ?Ð¸Ð¼ÐµÑ? Ð°ÐºÐ¾ Ð²Ð¸ Ñ?Ðµ Ð½Ð°Ð»Ð°Ð³Ð° Ð²Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ Ð¸Ð»Ð¸ Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ, Ð·Ð° Ð´Ð° Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð°Ñ?Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð²Ñ?Ñ?Ð·ÐºÐ°."
 
-#: 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 Ð¸Ð»Ð¸ Ñ?Ñ?Ñ?Ð½Ð¾ Ð·Ð°Ð´Ð°Ð´ÐµÐ½ Ð² 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 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ñ?ÐºÐ°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð°."
 
@@ -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 "Ð?Ð¾Ð´Ð¿Ñ?Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° MAC  Ð°Ð´Ñ?ÐµÑ?"
 
@@ -1585,7 +1605,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 "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°"
 
@@ -1608,52 +1628,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/bn.po b/bn.po
index 5a6d2c7683..38aab8b18f 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@xxxxxxxxx>\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 "<h1> à¦?à¦ªà¦¨à¦¾à¦° à¦¬à¦¾à¦? à¦ à¦¿à¦? à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦?à¦®à¦¾à¦¦à§?à¦° à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯ à¦?à¦°à§?à¦¨! </ h1>\n<p> <a href=\"%s\"> à¦?à¦®à¦¾à¦¦à§?à¦° à¦¬à¦¾à¦? à¦°à¦¿à¦ªà§?à¦°à§?à¦?à¦¿à¦? à¦¨à¦¿à¦°à§?à¦¦à§?à¦¶à¦¾à¦¬à¦²à§? </a> à¦ªà¦¡à¦¼à§?à¦¨à¥¤ </ p>\n<p> <strong> à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨à§?à¦° à¦¬à§?à¦¶à¦¿ à¦¬à§?à¦¯à¦?à§?à¦¤à¦¿à¦?à¦¤ à¦¤à¦¥à§?à¦¯ à¦?à¦¨à§?à¦¤à¦°à§?à¦à§?à¦?à§?à¦¤ à¦?à¦°à¦¬à§?à¦¨ à¦¨à¦¾\n </ strong> </ p &>\n<h2> à¦?à¦®à¦¾à¦¦à§?à¦° à¦?à¦?à¦?à¦¿ à¦?à¦®à§?à¦² à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦¦à§?à¦?à¦¯à¦¼à¦¾à¦° à¦¬à¦¿à¦·à¦¯à¦¼à§? </ h2>\n<P> à¦¯à§?\nà¦?à¦®à¦¾à¦¦à§?à¦° à¦?à¦?à¦?à¦¿ à¦?à¦®à§?à¦² à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦°à¦¦à¦¾à¦¨ à¦?à¦®à¦°à¦¾ à¦?à¦ªà¦¨à¦¾à¦?à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾ à¦¬à§?à¦¯à¦¾à¦?à§?à¦¯à¦¾ à¦?à¦°à¦¤à§?  à¦¯à§?à¦?à¦¾à¦¯à§?à¦? à¦?à¦°à¦¤à§? à¦?à¦°à¦¬à¥¤ à¦?à¦?\nà¦?à¦®à¦°à¦¾ à¦¯à§? à¦°à¦¿à¦ªà§?à¦°à§?à¦?à¦?à§?à¦²à¦¿ à¦ªà§?à¦¯à¦¼à§?à¦?à¦¿ à¦¤à¦¾à¦° à¦¬à§?à¦¶à¦¿à¦°à¦à¦¾à¦? à¦°à¦¿à¦ªà§?à¦°à§?à¦?à¦?à§?à¦²à¦¿à¦° à¦?à¦¨à§?à¦¯ à¦ªà§?à¦°à¦¯à¦¼à§?à¦
 ?à¦¨ à¦¹à¦¯à¦¼\nà¦?à§?à¦¨ à¦¯à§?à¦?à¦¾à¦¯à§?à¦?à§?à¦° à¦¤à¦¥à§?à¦¯ à¦¬à§?à¦¯à¦¤à§?à¦¤ à¦?à¦°à§?à¦¥à¦¹à§?à¦¨ à¦¹à¦¯à¦¼à¥¤ à¦?à¦¨à§?à¦¯à¦¦à¦¿à¦?à§? à¦?à¦?à¦¿ à¦?à¦?à¦¿ à¦ªà§?à¦°à¦¦à¦¾à¦¨ à¦?à¦°à§?\nà¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦?à¦² à¦¬à¦¾ à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦? à¦ªà§?à¦°à¦¦à¦¾à¦¨à¦?à¦¾à¦°à§?, à¦¯à§?à¦®à¦¨ eavesdroppers à¦?à¦¨à§?à¦¯ à¦?à¦?à¦?à¦¿ à¦¸à§?à¦¯à§?à¦?\nà¦?à¦ªà¦¨à¦¿ à¦ªà§?à¦°à§?à¦? à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à¦?à§?à¦¨ à¦¤à¦¾ à¦¨à¦¿à¦¶à§?à¦?à¦¿à¦¤ à¦?à¦°à§?à¦¨\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 "à¦?à¦¤à¦¿à¦°à¦¿à¦?à§?à¦¤ à¦¸à¦«à¦?à¦?à¦¯à¦¼à§?à¦¯à¦¾à¦°"
@@ -90,12 +90,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 "_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"
 
@@ -378,54 +378,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 "_Administration Password"
 
-#: 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 Address 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 "_Network Connection"
 
-#: 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 "_Start 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 à¦«à§?à¦°à¦¤ à¦?à§?à¦¡ {returncode} à¦¦à¦¿à¦¯à¦¼à§? à¦¬à§?à¦¯à¦°
 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 "_Language"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Keyboard Layout"
-
-#: 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 "_Keyboard Layout"
+
 #: 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 "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 "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¸à¦?à¦°à¦?à§?à¦·à¦¿à¦¤ à¦¬à§?à¦?à¦®à¦¾à¦°à§?à¦?"
 
-#: 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 "Printers"
 
-#: 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 "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 "à¦?à¦²à§?à¦?à§?à¦?à§?à¦°à¦¾à¦®à§?à¦° à¦¬à¦¿à¦?à¦?à¦¯à¦¼à§?à¦¨ à¦?à¦¯à¦¼à¦¾à¦? à¦?à¦¬à¦? à¦?à¦¨à¦«à¦¿à¦?à¦¾à¦°à§?à¦¶à¦¨"
 
-#: 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 "à¦ªà¦¾à¦?à¦¡à¦¿à¦¨ à¦ªà§?à¦°à§?à¦«à¦¾à¦?à¦² à¦?à¦¬à¦? à¦?à¦?à¦¿à¦?à¦° à¦?à§?à¦°à¦¿à¦?"
 
-#: 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 Client"
 
-#: 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 "`à¦¡à¦?à¦«à¦¾à¦?à¦²à¦¸ 'à¦¡à¦¾à¦?à¦°à§?à¦?à§?à¦?à¦°à¦¿à¦¤à§? à¦ªà¦¾à¦?à¦¯à¦¼à¦¾ à¦ªà§?à¦°à¦¤à¦¿à¦?à¦¿ à¦«à¦¾à¦?à¦² à¦¬à¦¾ à¦¡à¦¾à¦?à¦°à§?à¦?à§?à¦?à¦°à¦¿à¦¤à§? $ HOME à¦? Symlink"
@@ -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 "\"<b>à¦?à¦ªà¦?à§?à¦°à§?à¦¡ à¦¦à§?à¦?à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦?à¦ªà¦²à¦¬à§?à¦§ à¦¯à¦¥à§?à¦·à§?à¦? à¦®à§?à¦®à¦°à¦¿ à¦¨à§?à¦?à¥¤</b>\n\nà¦¨à¦¿à¦¶à§?à¦?à¦¿à¦¤ à¦?à¦°à§?à¦¨ à¦¯à§? à¦?à¦? à¦¸à¦¿à¦¸à§?à¦?à§?à¦® à¦?à¦¾à¦?à¦² à¦?à¦¾à¦²à¦¾à¦¨à§?à¦° à¦?à¦¨à§?à¦¯ à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨à§?à¦¯à¦¼à¦¤à¦¾ à¦¸à¦¨à§?à¦¤à§?à¦·à§?à¦? à¦?à¦°à§?à¦¨\nà¦¦à§?à¦?à§?à¦¨:  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 "à¦¤à§?à¦°à§?à¦?à¦¿:"
 
@@ -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 "à¦?à¦¨à¦¿à¦°à¦¾à¦ªà¦¦ à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§?à¦° à¦®à¦§à§?à¦¯à§? à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦?à§?à¦°à¦¿à¦¯à¦¼à¦¾à¦?à¦²à¦¾à¦ªà¦?à¦¿ <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 "à¦?à¦° à¦ªà§?à¦¨à¦°à¦¾à¦¯à¦¼ à¦?à¦°à¦®à§?à¦ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥ à¦¹à¦¯à¦¼à§?à¦?à§?"
 
-#: 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 "à¦?à§?à¦¨à¦? DNS à¦¸à¦¾à¦°à§?à¦à¦¾à¦° 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 "à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦?à¦¾à¦²à¦¾à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥ à¦¹à¦¯à¦¼à§?à¦?à§?"
 
@@ -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 "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 "à¦?à¦¨à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦?à¦°à¦¾ _Persistent Storage"
 
 #. 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 "_Additional Settings"
 
-#: ../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 "_Start Tails"
+
 #: ../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 9a861002fa..c499915ea9 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,54 +376,58 @@ msgstr "OuzhpennaÃ±"
 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 "Ezlinenn"
 
-#: 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 "Bevaet"
+
+#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Fazi"
 
@@ -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 "Shutdown"
+
+#: ../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 ed6ddbc8e2..563fed661d 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,54 +375,58 @@ msgstr "Dodaj"
 msgid "Back"
 msgstr "Nazad"
 
-#: 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 "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 "OmoguÄ?eno"
+
+#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "OnemoguÄ?i"
 
 #: ../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 "Shutdown"
+
+#: ../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 3907168e55..c4b1a076a2 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@xxxxxxxxx>\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 "Programari addicional"
@@ -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,54 +392,58 @@ msgstr "Afegeix"
 msgid "Back"
 msgstr "Enrere"
 
-#: 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 "_Contrasenya d'administrador"
 
-#: 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 "_AdreÃ§a MAC simulada"
 
-#: 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 "_ConnexiÃ³ de xarxa"
 
-#: 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 (defecte)"
 
-#: 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 i servidor intermedi"
 
-#: 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 "Fora de lÃnia"
 
-#: 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 "Habilitat"
+
+#: 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 "ActivaciÃ³ (defecte)"
 
-#: 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 "Activat"
 
-#: 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 "Desactivar"
 
-#: 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 "DesactivaciÃ³ (defecte)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Tancar"
-
-#: 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 ""
@@ -476,28 +480,28 @@ msgstr "unmount ha fallat amb el segÃ¼ent codi {returncode}:\n{stdout}\n{stderr}
 msgid "Unlockingâ?¦"
 msgstr "Desbloquejar"
 
-#: 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 "Desbloquejar"
 
-#: 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 es pot desbloquejar la memÃ²ria encriptada amb la contrasenya."
 
-#: 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 "_Llengua"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_DisposiciÃ³ del teclat"
-
-#: 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 "_DisposiciÃ³ del teclat"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -558,7 +562,7 @@ msgid "Passphrase can't be empty"
 msgstr "La contrasenya no pot quedar buida"
 
 #: 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 "Mostra la contrasenya"
 
@@ -666,78 +670,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Conserva els arxius emmagatzemats en la carpeta \"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 "Marcadors del navegador"
 
-#: 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 "Adreces d'interÃ¨s desades al Navegador 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 en xarxa"
 
-#: 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 "ConfiguraciÃ³ de dispositius en xarxa i 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 "Programari instalÂ·lat en iniciar el 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 "Impressores"
 
-#: 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 "ConfiguraciÃ³ d'impressores"
 
-#: 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 "Correu electrÃ²nic de Thunderbird, notÃcies i configuraciÃ³"
 
-#: 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 "Claus i configuraciÃ³ 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 "Moneder de Bitcoin d'Electrum i configuraciÃ³"
 
-#: 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 "Perfils de Pidgin i clauer d'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 "Claus SSH, configuraciÃ³ i amfitrions coneguts"
 
-#: 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 "Symlink a $HOME tot arxiu o carpeta trobat al directori 'dotfiles'"
@@ -754,7 +766,7 @@ msgstr "Configura el volum persistent 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 "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 "Â«<b>No hi ha prou memÃ²ria disponible per a comprovar les actualitzacions.</b>\n\nComproveu que el sistema compleix els requisits per a executar el Tails.\nMireu file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProveu de reiniciar el Tails per a tornar a comprovar les actualitzacions.\n\nO feu una actualitzaciÃ³ manual.\nMireu 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 "Hi ha hagut un error:"
 
@@ -1394,65 +1406,73 @@ msgstr "No s'ha pogut afegir el contenidor de fitxers %s: s'ha excedit el temps
 msgid "Choose File Container"
 msgstr "Trieu Contenidor d'arxius"
 
-#: 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 "Es necessita l'autenticaciÃ³ per eliminar un paquet del programari addic
 
 #: ../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 "Contrasenya d'administador"
 
@@ -1569,7 +1589,7 @@ msgid "Disable"
 msgstr "Inhabilita"
 
 #: ../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 "Falsejament de direcciÃ³ MAC"
 
@@ -1590,7 +1610,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "No falsejar les direccions 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Ã³ de xarxa"
 
@@ -1613,52 +1633,81 @@ msgstr "Configureu un pont Tor o un proxy local"
 msgid "Disable all networking"
 msgstr "Desactiva tota la xarxa"
 
+#: ../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Ã  el pont i el servidor intermedi de Tor, posterior a una connexiÃ³ a la xarxa."
 
-#: ../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 "Benvingut 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 "Llengua i regiÃ³"
 
-#: ../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Ã³ per defecte"
 
-#: ../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 "_Emmagatzematge persistent encriptat"
 
 #. 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 "Entrar contrasenya per desbloquejar l'emmagatzematge persistent"
 
-#: ../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 "El vostre emmagatzematge persistent estÃ  desbloquejat. Reinicieu Tails per a bloquejar-lo de nou."
 
-#: ../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 "_ParÃ metres addicionals"
 
-#: ../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 "Afegir parÃ metres addicionals"
 
-#: ../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 "Els valors per defecte sÃ³n segurs en la majoria de situacions. Per afegir una configuraciÃ³ personalitzada, pressionar el botÃ³ \"+\"."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Tancar"
+
+#: ../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 "Contenidors de fitxers"
diff --git a/cs.po b/cs.po
index 65769d94ef..293b7bcf92 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 "<h1>Pomozte nÃ¡m opravit tuto chybu!</h1>\n<p>PÅ?eÄ?tÄ?te si <a href=\"%s\">naÅ¡e instrukce pro hlÃ¡Å¡enÃ chyb</a>.</p>\n<p><strong>NevklÃ¡dejte Å¾Ã¡dnÃ© osobnÃ Ãºdaje, kterÃ© nejsou nezbytnÄ? nutnÃ©!</strong></p>\n<h2>Jak je to s vaÅ¡Ã e-mailovou adresou</h2>\n<p>\nUvedenÃm svÃ© e-mailovÃ© adresy nÃ¡m umoÅ¾nÃte vÃ¡s kontaktovat v pÅ?ÃpadÄ?, Å¾e bude nutnÃ© upÅ?esnit nÄ?kterÃ© informace. To bÃ½vÃ¡ u ohlÃ¡Å¡enÃ½ch chyb Ä?astÃ© a hlÃ¡Å¡enÃ bez kontaktnÃch ÃºdajÅ¯ mohou bÃ½t bez toho nepouÅ¾itelnÃ¡. Na druhou stranu je potÅ?eba poÄ?Ãtat s tÃm, Å¾e tyto Ãºdaje mohou prozradit poskytovateli vaÅ¡Ã schrÃ¡nky nebo internetovÃ©ho pÅ?ipojenÃ, Å¾e Tails pouÅ¾ÃvÃ¡te.\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 "DodateÄ?nÃ½ software"
@@ -102,12 +102,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Chcete i pÅ?esto Electrum spustit?"
 
 #: 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 "_FalÅ¡ovÃ¡nÃ MAC adres"
 
-#: 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 "_SÃÅ¥ovÃ© pÅ?ipojenÃ"
 
-#: 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 "Povoleno"
+
+#: 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 "Zapnuto"
 
-#: 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 "Vypnuto"
 
-#: 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 "umount selhalo s nÃ¡vratovÃ½m kÃ³dem {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "OdemykÃ¡nÃ..."
 
-#: 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 "S tÃmto pÅ?ÃstupovÃ½m heslem nelze Å¡ifrovanÃ© ÃºloÅ¾iÅ¡tÄ? odemknout."
 
-#: 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 "_RozloÅ¾enÃ klÃ¡vesnice"
-
-#: 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 "_RozloÅ¾enÃ klÃ¡vesnice"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -556,7 +560,7 @@ msgid "Passphrase can't be empty"
 msgstr "Heslo nesmÃ bÃ½t prÃ¡zdnÃ©"
 
 #: 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 "Data uloÅ¾enÃ¡ ve sloÅ¾ce â??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 "ZÃ¡loÅ¾ky prohlÃÅ¾eÄ?e"
 
-#: 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 "ZÃ¡loÅ¾ky uloÅ¾enÃ© v prohlÃÅ¾eÄ?i 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 "SÃÅ¥ovÃ¡ pÅ?ipojenÃ"
 
-#: 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 "Konfigurace sÃÅ¥ovÃ½ch zaÅ?ÃzenÃ a pÅ?ipojenÃ"
 
-#: 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 nainstalovanÃ½ po spuÅ¡tÄ?nÃ 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 "TiskÃ¡rny"
 
-#: 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 "NastavenÃ tiskÃ¡ren"
 
-#: 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-maily, RSS kanÃ¡ly a nastavenÃ Thunderbirdu"
 
-#: 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 "KlÃÄ?enka GnuPG a jejÃ nastavenÃ"
 
-#: 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 "BitcoinovÃ¡ penÄ?Å¾enka Electrum a jejÃ nastavenÃ"
 
-#: 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 "Profily klienta Pidgin a OTR klÃÄ?enka"
 
-#: 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 Client"
 
-#: 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 klÃÄ?e, konfigurace a znÃ¡mÃ© poÄ?ÃtaÄ?e"
 
-#: 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 "SymbolickÃ½ odkaz do $HOME pro kaÅ¾dÃ½ soubor nebo adresÃ¡Å? v adresÃ¡Å?i â??dotfilesâ??"
@@ -752,7 +764,7 @@ msgstr "NastavenÃ trvalÃ©ho svazku pro 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 "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 "Vybrat souborovÃ½ kontejner"
 
-#: 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 "SÃÅ¥ovÃ¡ aktivita v NezabezpeÄ?enÃ©m prohlÃÅ¾eÄ?i <b>nenÃ anonymnÃ</b>.\\nPouÅ¾Ãvejte ho jen v pÅ?ÃpadÄ? nutnosti,\\nnapÅ?Ãklad pokud pro pÅ?ihlÃ¡Å¡enÃ nebo registraci pÅ?i aktivaci internetovÃ©ho pÅ?ipojenÃ."
 
-#: 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 "ProhlÃÅ¾eÄ? se nepodaÅ?ilo nakonfigurovat."
 
-#: 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 "ProhlÃÅ¾eÄ? se nepodaÅ?ilo spustit."
 
@@ -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 "FalÅ¡ovÃ¡nÃ MAC adres"
 
@@ -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 "Konfigurace pÅ?emostÄ?nÃ sÃtÄ? Tor nebo mÃstnÃ proxy"
 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 "Region a jazyk"
 
-#: ../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 "Pro odemÄ?enÃ trvalÃ©ho ÃºloÅ¾iÅ¡tÄ? zadejte heslo"
 
-#: ../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 "VÃ½chozÃ nastavenÃ je ve vÄ?tÅ¡inÄ? situacÃ bezpeÄ?nÃ©. Chcete-li pÅ?idat vlastnÃ nastavenÃ, klepnÄ?te nÃÅ¾e na tlaÄ?Ãtko â??+â??."
 
+#: ../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 78eef9d214..54d6b2c69a 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 "<h1>Helpwch ni atgyweirio'ch byg!</h1>\n<p>Darllenwch <a href=\"%s\">ein cyfarwyddiadau i adroddi bygiau</a>.</p>\n<p><strong>Peidiwch cynnwys fwy o gwybodaeth personol \nnag sydd rhaid!</strong></p>\n<h2>Amdan rhoi eich cyfeiriad e-bost</h2>\n<p>Os nad ydych yn poeni rhoi rhai rhannau o'ch hunaniaeth\ni'r datblygwyr Tails, gallwch rhoi e-bost i adael i ninnau ofyn\nam fwy o wybodaeth am y byg. Hefyd, wrth gynnwys allwedd\nPGP cyhoeddus, gallen ni amgryptio unrhyw cyfarthrebiad\ndyfodol.</p>\n<p>Bydd unrhyw un sydd gallu darllen y neges hon yn Ã´l pob tebyg \nyn tybu eich fod yn defnyddwyr Tails. Amser feddwl am faint o\nymddiriediaeth rydych yn rhoi i'ch datparwyr We ac e-bost?</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 ""
@@ -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 "_Llwythwch"
 
 #: 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 "_Gadael"
 
@@ -378,54 +378,58 @@ msgstr "Ychwanegu"
 msgid "Back"
 msgstr "Yn Ã´l"
 
-#: 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
+#: 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 "Wedi Galluogi"
+
+#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Cadw ffeiliau yn y plygell 'Parhaol'"
 
 #: 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 "Browser Bookmarks"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+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 "Cysylltiadau Rhwydwaith"
 
-#: 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 ""
 
-#: 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 "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 "Cylch allweddi a ffurfweddiad 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 ""
 
-#: 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 ""
 
-#: 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 "Cleient 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 ""
 
-#: 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 "Gwall"
 
@@ -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 "gwall:"
 
@@ -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 "Ydych chi wir eisiau llwytho'r porwr anniogel?"
 
-#: 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 "Dechrau'r porwr anniogel..."
 
-#: 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 "Efallai bydd hyn yn cymryd tipyn o amser, felly byddwch yn amineddgar, os gwelwch yn dda."
 
-#: 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 "Yn cae lawr y porwr anniogel..."
 
-#: 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 "Efallai bydd hyn yn cymryd tipyn o amser. Ni allwch ailgychwyn y porwr anniogel tan ei fod wedi'i cau lawr yn iawn."
 
-#: 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 "Methu ailgychwyn 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 "Porwr anniogel"
 
-#: 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 "Mae porwr anniogel arall yn rhedeg, neu yn cael ei daclyso. Ceisiwch eto mewn funud neu ddwy."
 
-#: 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 "Methu sefydlu'r croot."
 
-#: 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 "Doedd ddim gwasanaethwr DNS wedi'i sicrhau trwy DHCP, na trwy ffyrffweddiad Ã¢ llaw yn 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 ""
 
@@ -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 "Shutdown"
+
+#: ../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..c70c858cd9 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 "Aktiveret"
+
+#: 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 71589cb195..c151392c38 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@xxxxxxxxxxxxxx>\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@xxxxxxxxxx>\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 "ZusÃ¤tzliche Software"
@@ -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,54 +405,58 @@ msgstr "HinzufÃ¼gen"
 msgid "Back"
 msgstr "ZurÃ¼ck"
 
-#: 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 "_Administrationspasswort"
 
-#: 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 "_Manipulation der MAC-Adresse"
 
-#: 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 "_Netzwerkverbindung"
 
-#: 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 "Direkt (Vorgabe)"
 
-#: 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 "BrÃ¼cke und Vermittlungsserver"
 
-#: 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 "Aktiv"
+
+#: 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 "Ein (Vorgabe)"
 
-#: 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 "Ein"
 
-#: 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 "Aus"
 
-#: 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 "Aus (Vorgabe)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Herunterfahren"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "Tails _starten"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -489,28 +493,28 @@ msgstr "umount ist mit Code {returncode} fehlgeschlagen:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "Wird entsperrtâ?¦"
 
-#: 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 "Entsperren"
 
-#: 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 "VerschlÃ¼sselter Speicherbereich kann mit dieser Passphrase nicht entsperrt werden."
 
-#: 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_prache"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Tastaturbelegung"
-
-#: 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 "_Formate"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Tastaturbelegung"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -571,7 +575,7 @@ msgid "Passphrase can't be empty"
 msgstr "Passphrase darf nicht leer sein"
 
 #: 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 "Passphrase anzeigen"
 
@@ -679,78 +683,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Daten im Â»PersistentÂ«-Ordner dauerhaft speichern"
 
 #: 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-Lesezeichen"
 
-#: 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 "Lesezeichen, die im Tor-Browser gespeichert wurden"
 
-#: 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 "Netzwerkverbindungen"
 
-#: 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 "Einstellungen von NetzwerkgerÃ¤ten und -verbindungen"
 
-#: 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 "Automatisch beim Start von Tails installierte Software "
 
-#: 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 "Drucker"
 
-#: 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 "Druckereinstellungen"
 
-#: 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, und Einstellungen"
 
-#: 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-SchlÃ¼sselbund und -Einstellungen"
 
-#: 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-Anwendung"
 
-#: 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-Wallet und 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-Profile und OTR-SchlÃ¼sselbund"
 
-#: 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-Programm"
 
-#: 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-SchlÃ¼ssel, -Einstellungen und bekannte Rechner"
 
-#: 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 "Alle Dateien und Verzeichnisse, die sich im Â»dotfilesÂ«-Ordner befinden, mit dem PersÃ¶nlichen Ordner verknÃ¼pfen"
@@ -767,7 +779,7 @@ msgstr "BestÃ¤ndige Datenpartition fÃ¼r Tails erstellen"
 #: 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 "Import von SchlÃ¼sseln aus {path} ist fehlgeschlagen:\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] "SchlÃ¼ssel importiert"
@@ -878,7 +890,7 @@ msgstr[1] "SchlÃ¼ssel importiert"
 
 #. 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 "\"<b>Nicht ausreichend freier Arbeitsspeicher, um nach Aktualisierungen zu prÃ¼fen.</b>\n\nStellen Sie sicher, dass das System den Voraussetzungen fÃ¼r ein laufendes Tails-System entspricht.\nSee file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nVersuchen Sie Tails neu zu starten und erneut nach Aktualisierungen zu prÃ¼fen.\n\nOder fÃ¼hren Sie eine manuelle Aktualisierung durch.\nLesen Sie 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 "Fehler:"
 
@@ -1407,65 +1419,73 @@ msgstr "Datei-Container %s konnte nicht hinzugefÃ¼gt werden: ZeitÃ¼berschreitung
 msgid "Choose File Container"
 msgstr "Container auswÃ¤hlen"
 
-#: 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 "Authentifizierung wird benÃ¶tigt, um ein Paket von Ihrer zusÃ¤tzlichen 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 "Administrationspasswort"
 
@@ -1582,7 +1602,7 @@ msgid "Disable"
 msgstr "Deaktivieren"
 
 #: ../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 "Manipulation der MAC-Adresse"
 
@@ -1603,7 +1623,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "MAC-Adressen nicht manipulieren"
 
 #: ../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 "Netzwerkkonfiguration"
 
@@ -1626,52 +1646,81 @@ msgstr "Tor-BrÃ¼cke oder lokalen Vermittlungsserver konfigurieren"
 msgid "Disable all networking"
 msgstr "Alle Netzwerkfunktionen deaktivieren"
 
+#: ../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 "Die Tor-BrÃ¼cke und den lokalen Vermittlungsserver (Proxy) spÃ¤ter nach dem Verbinden mit dem Netzwerk konfigurieren."
 
-#: ../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 "Willkommen bei 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 "Sprache & 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 "Vorgabeeinstellungen"
 
-#: ../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 "VerschlÃ¼sselter _bestÃ¤ndiger Speicherbereich"
 
 #. 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 "Geben Sie Ihre Passphrase ein, um die bestÃ¤ndigen Speicherbereich zu entsperren"
 
-#: ../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 "Ihr bestÃ¤ndiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn wieder zu sperren."
 
-#: ../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 "_ZusÃ¤tzliche Einstellungen"
 
-#: ../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 "ZusÃ¤tzliche Einstellung hinzufÃ¼gen"
 
-#: ../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 "Die Standardeinstellungen sind in den meisten Situationen sicher. Um benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die SchaltflÃ¤che Â»+Â«."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Herunterfahren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "Tails _starten"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Datei-Container"
diff --git a/el.po b/el.po
index 65ff5f9df2..5000d72e52 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,54 +396,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 "_Î?ÎÏ?Ï?Ï?Î± & 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 "Î?ÎºÏ?Ï?Ï? Ï?Ï?Î½Î´ÎµÏ?Î·Ï?"
 
-#: 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 ""
@@ -480,28 +484,28 @@ msgstr "Ï?Î¿ umount Î±Ï?ÎÏ?Ï?Ï?Îµ Î¼Îµ Ï?Î¿Î½ ÎºÏ?Î´Î¹ÎºÏ? ÎµÏ?Î¹Ï?Ï?Ï?Î¿Ï?Î®Ï?
 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 ""
@@ -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 "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"
 
-#: 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"
 
-#: 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 "Email, Ï?Ï?Î¿Ï?Î¿Î´Î¿Ï?Î¯Î± ÎºÎ±Î¹ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Î¿Ï? 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 "Î ÎµÎ»Î¬Ï?Î·Ï? 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 "Î Î¿Ï?Ï?Î¿Ï?Ï?Î»Î¹ bitcoin ÎºÎ±Î¹ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Ï?Î¿Ï? 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 Client"
 
-#: 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 "Symlink Ï?Ï?Î¿ $HOME ÎºÎ¬Î¸Îµ Î±Ï?Ï?ÎµÎ¯Î¿Ï? Î® Ï?Î±ÎºÎÎ»Î¿Ï? Ï?Î¿Ï? Î²Ï?Î¯Ï?ÎºÎµÏ?Î±Î¹ Ï?Ï?Î¿ Ï?Ï?Ï?Î¿ Î±Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î·Ï? 'dotfiles'"
@@ -758,7 +770,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 "Î£Ï?Î¬Î»Î¼Î±"
 
@@ -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 "\"<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 "Ï?Ï?Î¬Î»Î¼Î±:"
 
@@ -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 "Î? Î´Ï?Î±Ï?Ï?Î·Ï?Î¹Ï?Ï?Î·Ï?Î± Î¼ÎÏ?Î± Î±Ï?Ï? Unsafe Browser  <b>Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½Ï?Î½Ï?Î¼Î·</b>.\\n Î§Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?Ï?Îµ Unsafe Browser Î¼Ï?Î½Î¿ Ï?Ï?Î±Î½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î³ÎºÎ±Î¯Î¿, Î³Î¹Î± Ï?Î±Ï?Î¬Î´ÎµÎ¹Î³Î¼Î±\\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 "Î?ÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î¿Ï? Î¼Î· Î±Ï?Ï?Î±Î»Î® 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 "Î?Î»Î»Î¿Î¯Ï?Ï?Î· Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·Ï? MAC"
 
@@ -1594,7 +1614,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 "Î¡Ï?Î¸Î¼Î¹Ï?Î· Î´Î¹ÎºÏ?Ï?Î¿Ï?"
 
@@ -1617,52 +1637,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 ÎºÎ±Î¹ Ï?Î¿Î½ Ï?Î¿Ï?Î¹ÎºÏ? 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 "Î?Î±Î»Ï?Ï?Î®Ï?Î¸Î±Ï?Îµ Ï?Ï?Î¿ 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/en_GB.po b/en_GB.po
index de77470277..3ed6287f09 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 "<h1>Help us fix your bug!</h1>\n<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n<p><strong>Do not include more personal information than\nneeded!</strong></p>\n<h2>About giving us an email address</h2>\n<p>\nGiving us an email address allows us to contact you to clarify the problem. This\nis needed for the vast majority of the reports we receive as most reports\nwithout any contact information are useless. On the other hand it also provides\nan opportunity for eavesdroppers, like your email or Internet provider, to\nconfirm that you are using 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 "Additional Software"
@@ -91,12 +91,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Do you want to start Electrum anyway?"
 
 #: 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"
 
@@ -379,54 +379,58 @@ msgstr "Add"
 msgid "Back"
 msgstr "Back"
 
-#: 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 "_Administration Password"
 
-#: 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 Address 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 "_Network Connection"
 
-#: 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 "Direct (default)"
 
-#: 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 "Enabled"
+
+#: 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 (default)"
 
-#: 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 (default)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: 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 ""
@@ -463,28 +467,28 @@ msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "Unlockingâ?¦"
 
-#: 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 "Unlock"
 
-#: 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 "Cannot unlock encrypted storage with this passphrase."
 
-#: 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 "_Language"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Keyboard Layout"
-
-#: 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 "_Keyboard Layout"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -545,7 +549,7 @@ msgid "Passphrase can't be empty"
 msgstr "Passphrase can't be empty"
 
 #: 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 "Show Passphrase"
 
@@ -653,78 +657,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Keep files stored in the `Persistent' directory"
 
 #: 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 Bookmarks"
 
-#: 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 "Bookmarks save in 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 "Network Connections"
 
-#: 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 of network devices and connections"
 
-#: 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 installed when starting 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 "Printers"
 
-#: 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 "Printers configuration"
 
-#: 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 emails, feeds, and settings"
 
-#: 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 keyrings and configuration"
 
-#: 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 Client"
 
-#: 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's Bitcoin wallet and configuration"
 
-#: 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 profiles and OTR keyring"
 
-#: 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 Client"
 
-#: 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 keys, configuration and known hosts"
 
-#: 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 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
@@ -741,7 +753,7 @@ msgstr "Setup Tails persistent volume"
 #: 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"
 
@@ -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 "\"<b>Not enough memory available to check for upgrades.</b>\n\nMake sure this system satisfies the requirements for running Tails.\nSee file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nTry to restart Tails to check for upgrades again.\n\nOr do a manual upgrade.\nSee 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:"
 
@@ -1381,65 +1393,73 @@ msgstr "Could not add file container %s: Timeout while waiting for loop setup.\n
 msgid "Choose File Container"
 msgstr "Choose File Container"
 
-#: 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 "Do you really want to launch the 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 "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."
 
-#: 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 "Starting the 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 "This may take a while, so please be patient."
 
-#: 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 "Shutting down the Unsafe 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 "This may take a while, and you may not restart the Unsafe Browser until it is properly shut down."
 
-#: 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 "Failed to restart 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 "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 "Another Unsafe Browser is currently running, or being cleaned up. Please retry in a while."
 
-#: 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 "Failed to setup 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 "Failed to configure 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 "No DNS server was obtained through DHCP or manually configured in 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 "Failed to run browser."
 
@@ -1532,7 +1552,7 @@ msgstr "Authentication is required to remove a package from your additional soft
 
 #: ../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 "Administration Password"
 
@@ -1556,7 +1576,7 @@ msgid "Disable"
 msgstr "Disable"
 
 #: ../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 Address Spoofing"
 
@@ -1577,7 +1597,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Don't spoof MAC addresses"
 
 #: ../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 "Network Configuration"
 
@@ -1600,52 +1620,81 @@ msgstr "Configure a Tor bridge or local proxy"
 msgid "Disable all networking"
 msgstr "Disable all networking"
 
+#: ../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 "You will configure the Tor bridge and local proxy later on after connecting to a network."
 
-#: ../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 "Welcome to 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 "Language & 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 "Default Settings"
 
-#: ../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 "Encrypted _Persistent Storage"
 
 #. 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 "Enter your passphrase to unlock the persistent storage"
 
-#: ../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 "Your persistent storage is unlocked. Restart Tails to lock it again."
 
-#: ../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 "_Additional Settings"
 
-#: ../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 "Add an additional setting"
 
-#: ../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 "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Shutdown"
+
+#: ../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 "File Containers"
diff --git a/eo.po b/eo.po
index e3c3a079a0..920813e74f 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 "_Å?alti"
 
 #: 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 "_Eliri"
 
@@ -376,54 +376,58 @@ msgstr "Aldoni"
 msgid "Back"
 msgstr "Reen"
 
-#: 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
+#: 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 "EnÅ?altita"
+
+#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Eraro"
 
@@ -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 "eraro:"
 
@@ -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 "Ä?u vi vere volas Å?alti la malsekuran retumilon?"
 
-#: 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 "Å?altante la malsekuran retumilon..."
 
-#: 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 "Tio povas daÅri kelkajn minutojn, do ni petas, estu paciencaj."
 
-#: 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 "MalÅ?altante la malsekuran retumilon..."
 
-#: 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 "Tio povas daÅri kelkajn minutojn, kaj vi ne povas restartigi la malsekuran retumilon Ä?is kiam Ä?i ne estos tute malÅ?altita."
 
-#: 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 "Restartigo de Tor paneis."
 
-#: 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 "Malsekura Retumilo"
 
-#: 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 "Alia malsekura retumilo estas nun Å?altita aÅ malÅ?altota. Bonvolu reprovi tion post momento."
 
-#: 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 "Neniu DNS-servilo estis ricevita per DHCP aÅ permane agordita en Retagordilo (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 ""
 
@@ -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 "Malfunkciigi Ä?iuj retoj"
 
+#: ../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 "Shutdown"
+
+#: ../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 afc7f62536..1ff373f25c 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@xxxxxxxxx>\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 "Activado"
+
+#: 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 "La frase clave no puede estar vacÃa"
 
 #: 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 "Mantener archivos almacenados en la capeta '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 "Favoritos del navegador."
 
-#: 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 "Marcadores guardados en el 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 "Conexiones de red"
 
-#: 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 "ConfiguraciÃ³n de dispositivos de red y conexiones"
 
-#: 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 instalado al iniciar 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 "Impresoras"
 
-#: 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 "ConfiguraciÃ³n de las impresoras"
 
-#: 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 "Correo electrÃ³nico, fuentes y configuraciÃ³n 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 "Grupos de claves (keyrings) de GnuPG y configuraciÃ³n"
 
-#: 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 "Cliente de 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 "Cartera de bitcoins Electrum y configuraciÃ³n"
 
-#: 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 "Perfiles de Pidgin y grupo de claves ('keyring') OTR (cifrado Off The Record)"
 
-#: 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 "Cliente 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 "Claves SSH, configuraciÃ³n y hosts conocidos"
 
-#: 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 (formato de '.ficheros' de configuraciÃ³n)"
 
-#: 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 "Crear enlaces simbÃ³licos ('symlink') en $HOME para todos los ficheros o carpetas en la carpeta 'dotfiles' (formato de '.ficheros' de configuraciÃ³n)"
@@ -748,7 +760,7 @@ msgstr "Configurar el volumen persistente 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 "Error"
 
@@ -851,7 +863,7 @@ msgid ""
 "{error}"
 msgstr "Error al importar las claves 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] ""
@@ -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 2af78e4477..9809f3d24e 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,54 +383,58 @@ msgstr "Agregar"
 msgid "Back"
 msgstr "AtrÃ¡s"
 
-#: 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 "_Clave 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 "FalsificaciÃ³n 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 "Directo (por defecto)"
 
-#: 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 "Fuera de lÃnea"
 
-#: 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 "Activo"
+
+#: 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 "Encendido (por defecto)"
 
-#: 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 "Prendido"
 
-#: 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 "Apagado"
 
-#: 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 "Apagado (por defecto)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Apagar"
-
-#: 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 ""
@@ -467,28 +471,28 @@ msgstr "umount fallÃ³ con 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 encriptado con esta frase de 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 "DistribuciÃ³n 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 "DistribuciÃ³n de _Teclado"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -549,7 +553,7 @@ msgid "Passphrase can't be empty"
 msgstr "La frase de contraseÃ±a no puede ser vacÃa"
 
 #: 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 Frase de ContraseÃ±a"
 
@@ -657,78 +661,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Mantener los archivos almacenados en el directorio `Persistente'"
 
 #: 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 "Atajos del navegador"
 
-#: 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 "Marcadores guardados en el Navegador 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 "Conexiones de Red"
 
-#: 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 "ConfiguraciÃ³n de dispositivos y conexiones de red"
 
-#: 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 "Programas instalados cuando se inicia 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 "Impresoras"
 
-#: 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 "ConfiguraciÃ³n de impresoras"
 
-#: 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 "Correos electrÃ³nicos, contenidos y ajustes 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 "Conjuntos de claves GnuPG y configuraciones "
 
-#: 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 "Cliente 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 "Billetera bitcoin de Electrum y configuraciÃ³n"
 
-#: 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 "Perfiles pidgin y conjunto de claves 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 "Cliente 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 "Claves SSH, configuraciÃ³n y equipos conocidos"
 
-#: 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 "Archivos ocultos"
 
-#: 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 "Crear vÃnculos simbÃ³licos en $HOME de todos los archivos o directorios encontrados en el directorio `archivos_ocultos'"
@@ -745,7 +757,7 @@ msgstr "Configurar volumen persistente 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 "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 "No se pudo agregar el contenedor de archivo %s: Tiempo fuera mientras se
 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 "ContraseÃ±a de AdministraciÃ³n"
 
@@ -1560,7 +1580,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 "FalsificaciÃ³n de direcciÃ³n MAC"
 
@@ -1581,7 +1601,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "No falsificar las 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 Red"
 
@@ -1604,52 +1624,81 @@ msgstr "Configurar un puente Tor o proxy local"
 msgid "Disable all networking"
 msgstr "Deshabilitar todas las funciones 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 "Vas a configurar el puente Tor y el proxy local luego, despuÃ©s de conectar a una 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 por defecto"
 
-#: ../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 encriptado _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 "IngresÃ¡ tu frase de 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. ReiniciÃ¡ Tails para bloquearlo de nuevo."
 
-#: ../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 "Ajustes _Adicionales"
 
-#: ../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 "Agregar 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 "Los ajustes por defecto son seguros en la mayorÃa de las situaciones. Para aÃ±adir un ajuste personalizado, presionÃ¡ el botÃ³n \"+\" que estÃ¡ abajo."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Apagar"
+
+#: ../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 archivo"
diff --git a/es_MX.po b/es_MX.po
index 551fd51d5f..f1e23d5f94 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 "<h1>Ayudanos a arreglar tu error!</h1>\n<p>Lee<a href=\"%s\">nuestras instrucciones para reportar errores</a>.</p>\n<p><strong>No incluyas mas informaciÃ³n personal de la que se necesite!</strong></p>\n<h2>Sobre darnos tu direcciÃ³n de correo electrÃ³nico</h2>\n<p>\nDarnos tu direcciÃ³n de correo electrÃ³nico nos permitira contactarte para corregir el problema. Esto\nse necesita para la mayorÃa de los reportes que recibimos por que la mayorÃa de los reportes sin ninguna informaciÃ³n de contacto son inÃºtiles. Sin embargo, tambiÃ©n provee \nla oportunidad para que espias, como tus proveedores de correo electrÃ³nico o de Internet, \npuedan confirmar que estas 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 ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Quieres empezar Electrum como quiera?"
 
 #: 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"
 
@@ -377,54 +377,58 @@ msgstr "Agregar"
 msgid "Back"
 msgstr "AtrÃ¡s"
 
-#: 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 "_Clave de Administrador"
 
-#: 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 "_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 "Directo (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 & 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 "Fuera de Linea"
 
-#: 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 "Habilitado"
+
+#: 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 "Encendido (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 ""
 
-#: 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 "Apagado (predeterminado)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Apagar"
-
-#: 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 ""
@@ -461,28 +465,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 "Abrir"
 
-#: 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 descifrar el almacenamiento cifrardo con esta 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 "_Lenguaje"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_DistribuciÃ³n 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 "_DistribuciÃ³n de Teclado"
+
 #: 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 "Muestra la frase clave"
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Mantener archivos guardados en el directorio 'Persistente'"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Favoritos guardados en el Explorador 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 "Conexiones de Red"
 
-#: 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 "ConfiguraciÃ³n de dispositivos de red y conexiones. "
 
-#: 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 ""
 
-#: 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 "Impresoras"
 
-#: 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 "ConfiguraciÃ³n de impresoras"
 
-#: 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 "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 keyrings y configuraciÃ³n"
 
-#: 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 "ConfiguraciÃ³n y cartera bitcoin de 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 "Perfil Pidgin y OTR keyring"
 
-#: 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 "Cliente 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 "llaves SSH, configuraciÃ³n y hosts conocidos"
 
-#: 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 ""
@@ -739,7 +751,7 @@ msgstr "Ajustar el volumen persistente 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 "Error"
 
@@ -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 "Clave de AdministraciÃ³n"
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr "Desactivar"
 
 #: ../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 "DirecciÃ³n Mac Spoofing"
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "No falsificar 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 Red"
 
@@ -1598,52 +1618,81 @@ msgstr "Configurar un puente Tor u un proxy local"
 msgid "Disable all networking"
 msgstr "Desactivar toda actividad."
 
+#: ../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 "Tu configuraras el puente Tor y el proxy local despuÃ©s de conectarse a una 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 "Lenguaje 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 Estandar"
 
-#: ../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 _Cifrado 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 "Introduce tu fraseclave para abrir 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 esta abierto. Reinicia Tails para cerrarlo de nuevo."
 
-#: ../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 son seguras en la mayorÃa de las situaciones. Para aÃ±adir una configuraciÃ³n personal, haga clic en el button \"+\" abajo."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Apagar"
+
+#: ../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 ""
diff --git a/et.po b/et.po
index 858f42fa2b..ab9aa5ec99 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 "_KÃ¤ivita"
 
 #: 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,54 +377,58 @@ msgstr "Lisa"
 msgid "Back"
 msgstr "Tagasi"
 
-#: 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 "Sild ja proksi"
 
-#: 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 "Lubatud"
+
+#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Ava"
 
-#: 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 "_Keel"
 
-#: 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 "Browser Bookmarks"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+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 "VÃµrgu seaded"
 
-#: 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 ""
 
-#: 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 "Printerid"
 
-#: 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 "Printerite seadistamine"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "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 ""
 
-#: 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 vÃµtmed, hÃ¤Ã¤lestus ja tuntud hostid"
 
-#: 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 "Viga"
 
@@ -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 "tÃµrge:"
 
@@ -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 "Administreerimise parool"
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr "Keela"
 
 #: ../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 "Keel ja piiskond"
 
-#: ../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 "Vaikeseaded"
 
-#: ../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 "Shutdown"
+
+#: ../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 622c8aadad..5e4d606fad 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 "Software gehigarria"
@@ -94,12 +94,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Electrum abiatu nahi duzu hala ere?"
 
 #: 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 "_Abiarazi"
 
 #: 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 "_Irten"
 
@@ -382,54 +382,58 @@ msgstr "Gehitu"
 msgid "Back"
 msgstr "Atzera"
 
-#: 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 "_Administrazio Pasahitza"
 
-#: 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 "_Sare Konexioa"
 
-#: 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 "Zubia eta proxia"
 
-#: 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 "Lineaz kanpo"
 
-#: 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 "Gaituta"
+
+#: 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 "Itzali"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Abiarazi Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -466,28 +470,28 @@ msgstr ""
 msgid "Unlockingâ?¦"
 msgstr "Desblokeatzen..."
 
-#: 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 "Desblokeatu"
 
-#: 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 "_Hizkuntza"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Teklatuaren Diseinua"
-
-#: 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 "_Formatuak"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Teklatuaren Diseinua"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -548,7 +552,7 @@ msgid "Passphrase can't be empty"
 msgstr "Pasahitza ezin da hutsik egon"
 
 #: 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 "Erakutsi Sar-esaldia"
 
@@ -656,78 +660,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Mantendu fitxategiak `Iraunkorra' direktorioan"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Tor Navigatzailean gorde dira laster markak"
 
-#: 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 "Sare konexioak"
 
-#: 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 "Sare gailu eta konexioen konfigurazioa"
 
-#: 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 ""
 
-#: 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 "Imprimagailuak"
 
-#: 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 "imprimagailuen ezarpenak"
 
-#: 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 ""
 
-#: 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 gako sorta eta konfigurazioa"
 
-#: 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-en bitcoin-zorroa eta konfigurazioa"
 
-#: 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 profilak eta OTR gako sorta"
 
-#: 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 Bezeroa"
 
-#: 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 gakoak, konfigurazioa eta ostalari ezagunak"
 
-#: 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 fitxategiak"
 
-#: 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' direktorioan aurkitutako edozein fitxategi edo direktorio $HOME era esteka sinbolikoa egin."
@@ -744,7 +756,7 @@ msgstr "Konfiguratu Tailsen bolumen iraunkorra"
 #: 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 "Akatsa"
 
@@ -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 "akatsa:"
 
@@ -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 "Nabigatzaile ez segurua abiatzen..."
 
-#: 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 "Honek debora behar dezake, izan pazientzia."
 
-#: 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 "Nabigatzaile ez segurua itzaltzen..."
 
-#: 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 "Huts egin du Tor berrabiaraztean."
 
-#: 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 "Nabigatzaile ez segurua"
 
-#: 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 "Huts egin du chroot ezartzean."
 
-#: 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 "Huts egin du nabigatzailea konfiguratzean."
 
-#: 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 "Huts egin du nabigatzailea abiatzean."
 
@@ -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 "Administrazio Pasahitza"
 
@@ -1559,7 +1579,7 @@ msgid "Disable"
 msgstr "Desgaitu"
 
 #: ../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 "Sare Ezarpenak"
 
@@ -1603,52 +1623,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr "Ezgaitu konexio guztiak"
 
+#: ../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 "Ongi etorri Tails-era"
 
-#: ../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 "Hizkuntza eta eskualdea"
 
-#: ../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 "Ezarpen lehenetsiak"
 
-#: ../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 "_Ezarpen Gehiagarriak"
 
-#: ../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 "Gehitu ezarpen gehigarria"
 
-#: ../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 "Itzali"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Abiarazi Tails"
+
 #: ../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 6b1fb1fd09..83dfcdd9c6 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 "<h1>Ø¨Ø±Ø§Û? Ø±Ù?Ø¹ Ø§Û?Ø±Ø§Ø¯ Ù?Ø±Ù?â??Ø§Ù?Ø²Ø§Ø±Û? Ø¨Ù? Ù?Ø§ Ú©Ù?Ú© Ú©Ù?Û?Ø¯!</h1>\n\n<p><a href=\"%s\">Ø±Ø§Ù?Ù?Ù?Ø§Û? Ú¯Ø²Ø§Ø±Ø´ Ø§Û?Ø±Ø§Ø¯Ù?Ø§Û? Ù?Ø±Ù?â??Ø§Ù?Ø²Ø§Ø±Û? Ù?Ø§</a> Ø±Ø§ Ø¨Ø®Ù?Ø§Ù?Û?Ø¯</p>\n\n<p><strong>Do not include more personal information than\n\nneeded!</strong></p>\n\n<h2>Ø¯Ø±Ø¨Ø§Ø±Ù?â??Û? Ø§Ø±Ø§Ø¦Ù?â??Û? Û?Ú© Ø¢Ø¯Ø±Ø³ Ø±Ø§Û?Ø§Ù?Ø§Ù?Ù? (Ø§Û?Ù?Û?Ù?) Ø¨Ù? Ù?Ø§</h2>\n\n<p>\n\nGiving us an email address allows us to contact you to clarify the problem. This\n\nis needed for the vast majority of the reports we receive as most reports\n\nwithout any contact information are useless. On the other hand it also provides\n\nan opportunity for eavesdroppers, like your email or Internet provider, to\n\nconfirm that you are using Tails.\n\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 "Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø± Ø§Ø¶Ø§Ù?Û?"
@@ -116,12 +116,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 "Ø®Ø±Ù?Ø¬"
 
@@ -404,54 +404,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 "_Ø¢ØºØ§Ø² TailÙ?Ø§"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -488,28 +492,28 @@ msgstr "Ø¯Ø³ØªÙ?Ø± umount Ù?Ù?Ù?Ù? Ù?Ø¨Ù?Ø¯ Ø¨Ø§ Ú©Ø¯ Ø¨Ø§Ø²Ú¯Ø´Øª {returncode}:
 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 ""
@@ -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 "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 "Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø± Ù?Ù?Ú¯Ø§Ù?Û? Ú©Ù? ØªÛ?Ù?Ø² Ø´Ø±Ù?Ø¹ Ù?Û?â??Ø´Ù?Ø¯ Ù?ØµØ¨ Ø´Ø¯Ù?"
 
-#: 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 "Ù¾Ù?Ù?Ø±Ø¨Ù?Ø¯Ù? Ù? Ø¬Ø§Ù?Ù?Ù?Ø¯Ù? Ú¯Ù?Ù? Ù¾Ø±Ø§Ù?Ù?Ø³Ù? Ú¯Ø§Ø±Ø¯"
 
-#: 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 "Ù?Ù?Ø§Ù?Ù?â??Ù?Ø§ Ù? Ø¬Ø§Ù?Ù?Ù?Ø¯Ù? Ù¾Ù?Ø¬Ù?Ù?"
 
-#: 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 Client)"
 
-#: 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 "Ù?Ø§Ù?Ù?â??Ù?Ø§Ù? Ù¾Ù?Ù?Ø§Ù? (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) Ù¾Û?Ø¯Ø§ Ø´Ø¯Ù? Ø§Ù?Ø¯Ø? Û?Ú© Ø±Ø§Ø¨Ø· Ù?Ù?Ø§Ø¯Ù?Ù? (symlink) Ø¨Ø³Ø§Ø²"
@@ -766,7 +778,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 "Ø®Ø·Ø§"
 
@@ -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 "<b>ØØ§Ù?Ø¸Ù? Ø±Ù? Ø®Ø§Ù?Û? Ø¬Ù?Øª Ø¨Ø±Ø±Ø³Û? Ø¨Ø±Ø§Û? Ø¨Ù? Ø±Ù?Ø² Ø±Ø³Ø§Ù?Û? Ù?Ù?Ø¬Ù?Ø¯ Ù?Û?Ø³Øª.</b>\n\nÙ?Ø·Ù?Ø¦Ù? Ø´Ù?Û?Ø¯ Ø§Û?Ù? Ø³Û?Ø³ØªÙ? ØØ¯Ø§Ù?Ù? Ù¾Û?Ø´ Ù?Û?Ø§Ø²Ù?Ø§Û? Ù?Ø§Ø²Ù? Ø¨Ø±Ø§Û? ØªÛ?Ù?Ø² Ø±Ø§ Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ù?Û? Ú©Ù?Ø¯.\nØ§Û?Ù? Ù?Ø§Û?Ù? Ø±Ø§ Ø¨Ø¨Û?Ù?Û?Ø¯:  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 "Ø®Ø·Ø§ :"
 
@@ -1406,65 +1418,73 @@ msgstr "Ø§Ù?Ø²Ù?Ø¯Ù? Ú©Ø§Ù?ØªÛ?Ù?Ø± Ù?Ø§Û?Ù? %s Ù?Ù?Ú©Ù? Ù?Ø´Ø¯: Ø§Ù?ØªØ¸Ø§Ø± Ø¨
 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 Û?Ø§ ØªÙ?Ø¸Û?Ù? Ø¯Ø³ØªÛ? Ø¯Ø± 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 "Ø§Ø¬Ø±Ø§Û? Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø§Ù?Ù?Ù?Ù? Ø¨Ù?Ø¯."
 
@@ -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 "Ø¬Ø¹Ù? Ù?Ú©Ø±Ø¯Ù? 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 "Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ø´Ø¨Ú©Ù?"
 
@@ -1625,52 +1645,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 "Ø¨Ù? ØªÛ?Ù?Ø² Ø®Ù?Ø´ Ø¢Ù?Ø¯Û?Ø¯!"
 
-#: ../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 "Ø°Ø®Û?Ø±Ù? Ø¯Ø§Ø¦Ù?Û? Ø¨Ø§Ø² Ø´Ø¯. Ø¨Ø±Ø§Û? Ù?Ù?Ù? Ú©Ø±Ø¯Ù?, Tail Ù?Ø§ Ø±Ø§ Ø±Û? Ø§Ø³ØªØ§Ø±Øª Ú©Ù?Û?Ø¯"
 
-#: ../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 "_Ø¢ØºØ§Ø² TailÙ?Ø§"
+
 #: ../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 0ac6796d2e..be0509a6a3 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 "LisÃ¤ohjelmistot"
@@ -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,54 +385,58 @@ msgstr "LisÃ¤Ã¤"
 msgid "Back"
 msgstr "Takaisin"
 
-#: 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 "_YllÃ¤pitosalasana"
 
-#: 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-osoitteen vÃ¤Ã¤rentÃ¤minen"
 
-#: 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 "_Verkkoyhteys"
 
-#: 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 "Silta & VÃ¤lityspalvelin"
 
-#: 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 "Poissa verkosta"
 
-#: 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 "KÃ¤ytÃ¶ssÃ¤"
+
+#: 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 "PÃ¤Ã¤llÃ¤ (oletus)"
 
-#: 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 "Pois pÃ¤Ã¤ltÃ¤"
 
-#: 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 "Pois pÃ¤Ã¤ltÃ¤ (oletus)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Sammuta"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_KÃ¤ynnistÃ¤ Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -469,28 +473,28 @@ msgstr ""
 msgid "Unlockingâ?¦"
 msgstr "Avataan..."
 
-#: 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 "Poista lukitus"
 
-#: 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 "PysyvÃ¤Ã¤ tallennustilaa ei voi avata tÃ¤llÃ¤ tunnuslausella."
 
-#: 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 "_Kieli"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_NÃ¤ppÃ¤imistÃ¶n pohja"
-
-#: 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 "_Muotoilut"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_NÃ¤ppÃ¤imistÃ¶n pohja"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -551,7 +555,7 @@ msgid "Passphrase can't be empty"
 msgstr "Salalause ei voi olla tyhjÃ¤"
 
 #: 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 "NÃ¤ytÃ¤ salasana"
 
@@ -659,78 +663,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "SÃ¤ilyttÃ¤Ã¤ tiedostot hakemistossa '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 "Selaimen kirjanmerkit"
 
-#: 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 "Kirjanmerkit tallennettu Tor-selaimeen"
 
-#: 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 "Verkkoyhteydet"
 
-#: 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 "Verkkolaitteiden ja -yhteyksien asetukset"
 
-#: 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 "Asennetut ohjelmistot Tailsin kÃ¤ynnistyessÃ¤"
 
-#: 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 "Tulostimet"
 
-#: 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 "Tulostimien asetukset"
 
-#: 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 "Thunderbirdin sÃ¤hkÃ¶postit, syÃ¶tteet ja asetukset"
 
-#: 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-avainrenkaat ja -asetukset"
 
-#: 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-asiakasohjelma"
 
-#: 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 "Electrumin bitcoin-lompakko ja asetukset"
 
-#: 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-profiilit ja OTR-avaimet"
 
-#: 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-asiakasohjelma"
 
-#: 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-avaimet, -asetukset ja tunnetut palvelimet"
 
-#: 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 "PisteellÃ¤ alkavat tiedostot"
 
-#: 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 "Luo $HOME-kansioon symbolinen linkki jokaisesta tiedostosta, joka on dotfiles-kansiossa"
@@ -747,7 +759,7 @@ msgstr "Valmistele Tailsin pysyvÃ¤ taltio"
 #: 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 "Valitse tiedostosÃ¤ilÃ¶"
 
-#: 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 "Verkkotoiminta turvattomalla selaimella <b>ei ole anonyymia</b>.\\nKÃ¤ytÃ¤ turvatonta selainta vain, kun se on vÃ¤lttÃ¤mÃ¤tÃ¶ntÃ¤, esimerkiksi jos sinun on kirjauduttava tai rekisterÃ¶idyttÃ¤vÃ¤ Internet-yhteytesi aktivoimiseksi."
 
-#: 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 "YllÃ¤pitosalasana"
 
@@ -1562,7 +1582,7 @@ msgid "Disable"
 msgstr "Poista kÃ¤ytÃ¶stÃ¤"
 
 #: ../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-osoitteen VÃ¤Ã¤rentÃ¤minen"
 
@@ -1583,7 +1603,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Ã?lÃ¤ vÃ¤Ã¤rennÃ¤ MAC-osoitteita"
 
 #: ../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 "Verkon asetukset"
 
@@ -1606,52 +1626,81 @@ msgstr "MÃ¤Ã¤ritÃ¤ Tor-silta tai paikallinen vÃ¤lityspalvelin"
 msgid "Disable all networking"
 msgstr "Poista kaikki verkkoyhteydet kÃ¤ytÃ¶stÃ¤"
 
+#: ../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 "Tervetuloa kÃ¤yttÃ¤mÃ¤Ã¤n Tailsia!"
 
-#: ../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 "Kieli & Alue"
 
-#: ../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 "Oletusasetukset"
 
-#: ../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 "Salattu _pysyvÃ¤ tallennustila"
 
 #. 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 "Anna salasanasi avataksesi pysyvÃ¤n tallennustilan"
 
-#: ../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 "PysyvÃ¤ sÃ¤ilystilasi on auki. KÃ¤ynnistÃ¤ Tails uudelleen lukitaksesi se."
 
-#: ../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 "_LisÃ¤asetukset"
 
-#: ../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 "LisÃ¤Ã¤ lisÃ¤asetus"
 
-#: ../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 "Sammuta"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_KÃ¤ynnistÃ¤ Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "TiedostosÃ¤ilÃ¶t"
diff --git a/fr.po b/fr.po
index 4e33ac9e70..4b1bd308c8 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@xxxxxxxxxxxxxxxxxxx>\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 "ActivÃ©"
+
+#: 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 4de64ef3c0..4f4aaecdd1 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 "_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 ""
 
@@ -376,54 +376,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 ""
 
-#: 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 "Ynskeakele"
+
+#: 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 "Ofslute"
-
-#: 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 ""
@@ -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 "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 ""
 
-#: 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 "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 ""
 
-#: 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-client"
 
-#: 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 "Flater"
 
@@ -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 "flater:"
 
@@ -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 "Ofslute"
+
+#: ../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 10aed82290..fc1eb93273 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 "Cumasaithe"
+
+#: 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 "NÃ cheadaÃtear frÃ¡sa faire folamh"
 
 #: 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 "TaispeÃ¡in an FrÃ¡sa Faire"
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Coinnigh comhaid stÃ³rÃ¡ilte sa chomhadlann '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 "Leabharmharcanna an bhrabhsÃ¡laÃ"
 
-#: 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 "Leabharmharcanna sÃ¡bhÃ¡ilte i mBrabhsÃ¡laÃ 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 "Ceangail LÃonra"
 
-#: 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 "CumraÃocht glÃ©asanna lÃonra agus ceangal IdirlÃn"
 
-#: 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 "BogearraÃ a shuiteÃ¡iltear nuair a thosaÃonn 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 "PrintÃ©irÃ"
 
-#: 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 "CumraÃocht priontÃ¡la"
 
-#: 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 "RÃomhphost, fothaÃ, agus socruithe Ã³ 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 "FÃ¡innÃ eochracha GnuPG agus cumraÃocht"
 
-#: 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 "Cliant 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 "SparÃ¡n bitcoin agus cumraÃocht 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 "PrÃ³ifÃlÃ Pidgin agus fÃ¡inne eochracha 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 "Cliant 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 "Eochracha SSH, cumraÃocht, agus Ã³strÃomhairÃ aitheanta"
 
-#: 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 "Ponc-chomhaid"
 
-#: 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 "DÃ©an nasc siombalach in $HOME le gach comhad nÃ³ comhadlann sa chomhadlann `dotfiles'"
@@ -739,7 +751,7 @@ msgstr "Socraigh imleabhar seasmhach 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 "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 e2cf0ab146..197e8b7754 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@xxxxxxxxxxxxx>\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 "<h1>AxÃºdenos a amaÃ±ar o seu bug!</h1>\n<p>Lea <a href=\"%s\">as nosas instrucciÃ³ns para informar de bugs</a>.</p>\n<p><strong>Non inclÃºa mÃ¡is informaciÃ³n persoal da\nnecesaria!</strong></p>\n<h2>Acerca de proporcionarnos un enderezo electrÃ³nico</h2>\n<p>\nO darnos un email permÃtenos contactarlle para clarificar o problema. Isto\nÃ© necesario para a ampla maiorÃa dos informes que recibimos xa que moitos informes\nsen informaciÃ³n de contacto son inÃºtiles. Na outra banda tamÃ©n proporciona\nunha oportunidade para escoitas indiscretas, como o seu email ou proveedor de Internet, para\nconfirmar que vostede usa 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 ""
@@ -90,12 +90,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Quere arrancar 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 "_SaÃr"
 
@@ -378,54 +378,58 @@ msgstr "Engadir"
 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 ""
 
-#: 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 "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 "Activado"
+
+#: 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 "Shutdown"
-
-#: 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 ""
@@ -462,26 +466,26 @@ 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 ""
 
-#: 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 "A frase de acceso non pode estar baleira"
 
 #: 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 "Almacene os arquivos  no directorio 'Persistente'"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Marcadores gardados no 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 "ConexiÃ³ns de Rede"
 
-#: 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 "ConfiguraciÃ³n dos dispositivos de rede e as conexiÃ³ns"
 
-#: 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 ""
 
-#: 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 "Impresoras"
 
-#: 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 "ConfiguraciÃ³n de impresoras"
 
-#: 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 "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 "Aneis de chaves e configuraciÃ³n do 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 "Carteira de bitcoin Electrum e configuraciÃ³n"
 
-#: 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 "PerfÃs Pidgin e anel de chaves 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 "\t\nCliente 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 "Chaves SSH, configuraciÃ³n e hosts coÃ±ecidos"
 
-#: 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 (arquivos de configuraciÃ³ns \".arquivo\")"
 
-#: 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 "Crear ligazÃ³ns simbÃ³licas (symlinks) en $HOME para todos os arquivos ou cartafois que estean no cartafol 'dotfiles'"
@@ -740,7 +752,7 @@ msgstr "Configure o volume persistente 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 "Erro"
 
@@ -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 "erro:"
 
@@ -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 "Seguro que queres 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 "Iniciando 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 pode levar un pouco de tempo. 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 "Pechar 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 "Produciuse un erro ao 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 ""
 
-#: 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 "Desactivar"
 
 #: ../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 "Deshabilitar toda conexiÃ³n Ã¡ 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 ""
 
-#: ../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 "Axustes por defecto"
 
-#: ../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 "Shutdown"
+
+#: ../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 4bd5c1112e..f3772d6c9b 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,54 +375,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 ""
 
-#: 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 ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -459,28 +463,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 "_Language"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Keyboard Layout"
-
-#: 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 "_Keyboard Layout"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -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 "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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "SSH Client"
 
-#: 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 "MAC Address àª¸à«?àªªà«?àª«àª¿àª?àª?"
 
@@ -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 "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 ""
 
-#: ../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 f34349c5dd..1f318dc846 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,54 +383,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 ""
@@ -467,28 +471,28 @@ msgstr "umount × ×?×©×? ×¢×? ×§×?×? ×?×?×¨×? {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 "_×©×¤×?"
 
-#: 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 ""
@@ -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 "×©×?×?×¨ ×§×?×¦×?×? ×?×?×?×?×¡× ×?×? ×?×¡×?×¤×¨×?×?×ª `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 "×¦×?×¨ ×§×?×©×?×¨ ×¡×?×?×? ×?×? $HOME ×?×?×? ×§×?×?×¥ ×?×? ×¡×?×¤×¨×?×?×? ×?× ×?×¦×?×?×? ×?×¡×?×¤×¨×?×?×? `dotfiles'"
@@ -745,7 +757,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 "×©×?×?×?×?"
 
@@ -848,7 +860,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] "×?×¤×ª×? ×?×?×?×?"
@@ -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 "×?×? ×?×?×? × ×?×ª×? ×?×?×?×¡×?×£ ×?×?×? ×§×?×¦×?×? %s: ×¤×¡×§ ×?×?×? ×?
 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 "×?×?×?×£ ×?×ª×?×?×ª MAC"
 
@@ -1585,7 +1605,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 "×ª×¦×?×¨×ª ×¨×©×ª"
 
@@ -1608,52 +1628,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/hi.po b/hi.po
index 9eff3643ae..911ace3794 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,54 +377,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -461,28 +465,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 ""
@@ -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 "Shutdown"
+
+#: ../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..ac5b83ab02 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@xxxxxxxxxxx>\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 "Aktivirano"
+
+#: 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..668d891a95 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 "EngedÃ©lyezve"
+
+#: 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 ae5bf038a4..2da4fed74d 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,54 +376,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 ca3362b283..d23cc6ef5a 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 "Retro"
 
-#: 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 "Foras de linea"
 
-#: 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 "Activate"
+
+#: 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:274
-msgid "Off"
+#: 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:276
-msgid "Off (default)"
+#: 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:171
-msgid "Shutdown"
+#: 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/main_window.py:176
-msgid "_Start Tails"
+#: 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 "Error"
 
@@ -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 35c1811aeb..37080b308d 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@xxxxxxxx>\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 "<h1>Bantu kami memperbaiki kutu!</h1>\n<p>Baca <a href=\"%s\">panduan pelaporan kutu kami</a>.</p>\n<p><strong>Jangan sertakan informasi personal lebih dari\nyang diperlukan!</strong></p>\n<h2>Tentang alamat surel yang Anda berikan kepada kami</h2>\n<p>\nMemberikan alamat surel Anda kepada kami memungkinkan kami menghubungi\nAnda untuk mengklarifikasi masalah tersebut. Hal ini diperlukan untuk sebagian\nbesar laporan yang kami terima karena kebanyakan laporan tanpa informasi kontak\ntidak berguna. Dengan kata lain, hal tersebut juga menyediakan informasi\nkemungkinan adanya orang di tengah, seperti surel atau penyedia Internet Anda,\nuntuk mengonfirmasi bahwa Anda menggunakan 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 "Perangkat Lunak Tambahan"
@@ -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,54 +390,58 @@ msgstr "Tambah"
 msgid "Back"
 msgstr "Kembali"
 
-#: 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 Admin"
 
-#: 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 "_Pemalsuan alamat 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 "_Koneksi Jaringan"
 
-#: 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 "Langsung (default)"
 
-#: 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 "Luring"
 
-#: 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 "Diaktifkan"
+
+#: 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 "Aktif (default)"
 
-#: 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 "Hidup"
 
-#: 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 "Mati"
 
-#: 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 "Nonaktif (default)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Matikan"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Mulai Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -474,28 +478,28 @@ msgstr "umount gagal dengan kode {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "Membuka kunci..."
 
-#: 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 "Tidak terkunci"
 
-#: 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 "Tidak dapat membuka penyimpanan terenkripsi dengan frasa sandi ini."
 
-#: 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 "_Bahasa"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Tata Letak Keyboard"
-
-#: 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 "_Format"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Tata Letak Keyboard"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -556,7 +560,7 @@ msgid "Passphrase can't be empty"
 msgstr "Kalimat tidak boleh kosong"
 
 #: 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 "Tampilkan Kata Kunci"
 
@@ -664,78 +668,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Simpan berkas di direktori `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 "Markah Peramban"
 
-#: 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 "Markah tersimpan di dalam peramban 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 "Koneksi Jaringan"
 
-#: 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 "Pengaturan perangkat jaringan dan koneksi"
 
-#: 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 "Perangkat lunak terpasang saat memulai 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 "Pencetak"
 
-#: 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 "Konfigurasi pencetak"
 
-#: 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 "Surel, feed, dan pengaturan 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 "Keyrings GnuPG dan konfigurasi"
 
-#: 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 "Klien 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 "Dompet bitcoin dan konfigurasi 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 "Profil Pidgin dan keyring 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 "Aplikasi 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 "Kunci SSH, konfigurasi dan hos yang dikenal"
 
-#: 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 "Berkas titik"
 
-#: 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 ke dalam $HOME setiap file atau direktori di peroleh dalam direktori 'dotfiles'"
@@ -752,7 +764,7 @@ msgstr "Pengaturan volume tetap 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 "Kesalahan"
 
@@ -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 "\"<b>Tidak cukup memory tersedia untuk memeriksa pembaruan.</b>\n\nPastikan sistem ini memenuhi syarat-syarat untuk menjalankan Tails.\nlihat file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nCoba ulang kembali Tails untuk kembali memeriksa pembaruan.\n\nAtau lakukan pembaruan secara manual.\nLihat 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 "kesalahan:"
 
@@ -1390,65 +1402,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr "Pilih Kontainer Berkas"
 
-#: 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 "Apakah Anda benar-benar ingin menjalankan 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 "Aktifitas jaringan dengan Peramban Tidak Aman adalah  <b>tidak anonim</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 "Memulai 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 "Mungkin ini memakan waktu lama, mohon bersabar."
 
-#: 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 "Mematikan Unsafe 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 "Mungkin ini akan memakan waktu, dan Anda tidak boleh memulai ulang Unsafe Browser sampai ia dimatikan secara layak."
 
-#: 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 "Gagal memulai ulang 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 "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 "Peramban tak aman lain sedang berjalan, atau sedang dibersihkan. Silakan coba lagi nanti."
 
-#: 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 "Gagal mengkonfigurasi 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 "Konfigurasi peramban gagal."
 
-#: 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 "Server non-DNS didapati melalui DHCP atau dikonfigurasi manual di 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 "Gagal menjalankan peramban."
 
@@ -1541,7 +1561,7 @@ msgstr "Otentikasi diperlukan untuk menghapus sebuah paket dari perangkat lunak
 
 #: ../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 "Password Admin"
 
@@ -1565,7 +1585,7 @@ msgid "Disable"
 msgstr "Matikan"
 
 #: ../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 "Pemalsuan alamat MAC"
 
@@ -1586,7 +1606,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Jangan palsukan alamat 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 "Konfigurasi Jaringan"
 
@@ -1609,52 +1629,81 @@ msgstr "Atur Tor bridge atau proxy lokal"
 msgid "Disable all networking"
 msgstr "Nonaktifkan semua jaringan"
 
+#: ../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 "Anda akan mengatur jembatan Tor dan proxy lokal nanti setelah terhubung ke jaringan."
 
-#: ../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 "Selamat datang di 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 "Bahasa & Wilayah"
 
-#: ../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 "Pengaturan Default"
 
-#: ../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 "_Penyimpanan Menetap Terenkripsi"
 
 #. 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 "Masukkan kata kunci untuk memprotect volume persistent"
 
-#: ../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 "Penyimpanan Menetap Anda tidak terkunci. Memulai kembali Tails untuk menguncinya lagi."
 
-#: ../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 "_Pengaturan Tambahan"
 
-#: ../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 "Tambah pengaturan tambahan"
 
-#: ../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 "Pengaturan default aman untuk banyak situasi. Untuk menambah pengaturan tambahan, tekan tombol \"+\" di bawah."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Matikan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Mulai Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Wadah Berkas"
diff --git a/is.po b/is.po
index dff961a0ec..8e62cd35e0 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@xxxxxxxxxxx>\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 "<h1>HjÃ¡lpaÃ°u okkur aÃ° laga villuna Ã¾Ãna!</h1>\n<p>Lestu <a href=\"%s\">hvernig tilkynna eigi villur og galla</a>.</p>\n<p><strong>Ekki hafa meÃ° meira af persÃ³nulegum\nupplÃ½singum en Ã¾arf!</strong></p>\n<h2>AÃ° gefa okkur tÃ¶lvupÃ³stfang</h2>\n<p>\nEf Ã¾Ãº gefur okkur upp tÃ¶lvupÃ³stfang getum viÃ° haft samband til aÃ° ÃºtskÃ½ra stÃ¶Ã°u mÃ¡la.\nÃ?etta Ã¡ viÃ° mikinn meirihluta villuskÃ½rslna sem okkur berast, Ã¾vÃ annars eru skÃ½rslur Ã¡n\nupplÃ½singa um sendanda nokkuÃ° gagnslitlar. SÃ©u slÃkar upplÃ½singar gefnar, verÃ°ur aftur\ntil tÃ¦kifÃ¦ri fyrir Ã¾Ã¡ sem eru aÃ° njÃ³sna, eins og til dÃ¦mis netÃ¾jÃ³nustuna Ã¾Ãna, aÃ° staÃ°festa\naÃ° Ã¾Ãº sÃ©rt aÃ° nota 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 "ViÃ°bÃ³tarhugbÃºnaÃ°ur"
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Viltu samt rÃ¦sa 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 "_RÃ¦sa"
 
 #: 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 "_HÃ¦tta"
 
@@ -376,54 +376,58 @@ msgstr "BÃ¦ta viÃ°"
 msgid "Back"
 msgstr "Til baka"
 
-#: 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 "L_ykilorÃ° kerfisstjÃ³rnunar"
 
-#: 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 "DulbÃºningur _MAC-vistfangs"
 
-#: 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 "_Nettenging"
 
-#: 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 "Beint (sjÃ¡lfgefiÃ°)"
 
-#: 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 "BrÃº og milliÃ¾jÃ³nn"
 
-#: 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 "Ã?nettengt"
 
-#: 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 "Virkt"
+
+#: 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 "Kveikt (sjÃ¡lfgefiÃ°)"
 
-#: 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 "Kveikt"
 
-#: 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 "SlÃ¶kkt"
 
-#: 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 "SlÃ¶kkt (sjÃ¡lfgefiÃ°)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "SlÃ¶kkva"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "RÃ¦_sa Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -460,28 +464,28 @@ msgstr "umount mistÃ³kst meÃ° svarkÃ³Ã°a {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "AflÃ¦siâ?¦"
 
-#: 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 "AflÃ¦sa"
 
-#: 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 "Get ekki aflÃ¦st dulritaÃ°ri gagnageymslu meÃ° Ã¾essum lykilfrasa."
 
-#: 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 "TungumÃ¡_l"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "Ly_klaborÃ°suppsetning"
-
-#: 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 "S_niÃ°"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "Ly_klaborÃ°suppsetning"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -542,7 +546,7 @@ msgid "Passphrase can't be empty"
 msgstr "Lykilfrasi mÃ¡ ekki vera auÃ°ur"
 
 #: 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 "Birta lykilsetningu"
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Halda skrÃ¡m sem geymdar eru Ã 'Varanlegt' mÃ¶ppunni"
 
 #: 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Ã³kamerki vafra"
 
-#: 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 "BÃ³kamerki vistuÃ° Ã Tor-vafranum"
 
-#: 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 "Nettengingar"
 
-#: 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 "Uppsetning nettenginga og nettengdra tÃ¦kja"
 
-#: 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 "HugbÃºnaÃ°ur uppsettur Ã¾egar Tails er rÃ¦st"
 
-#: 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 "Prentarar"
 
-#: 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 "Uppsetning prentara"
 
-#: 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 tÃ¶lvupÃ³star, frÃ©ttastreymi og stillingar"
 
-#: 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-lyklakippur og uppsetningar"
 
-#: 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-biÃ°lari"
 
-#: 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 "Bitcoin-veski Ã Electrum og uppsetning"
 
-#: 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-sniÃ° og OTR-lyklakippa"
 
-#: 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-biÃ°lari"
 
-#: 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-lyklar, uppsetning og Ã¾ekktar vÃ©lar"
 
-#: 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 "PunktaskrÃ¡r (dotfiles - faldar skrÃ¡r)"
 
-#: 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 "TÃ¡kntengja inn Ã $HOME hverja Ã¾Ã¡ skrÃ¡ eÃ°a mÃ¶ppu sem finnst Ã `dotfiles' mÃ¶ppunni"
@@ -738,7 +750,7 @@ msgstr "Setja upp varanlega gagnageymslu Ã 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 "Villa"
 
@@ -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 "\"<b>Ekki er nÃ¦gt minni eftir til aÃ° athuga meÃ° uppfÃ¦rslur.</b>\n\nGakktu Ãºr skugga um aÃ° Ã¾etta kerfi uppfylli krÃ¶fur til aÃ° keyra Tails.\nSkoÃ°aÃ°u file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nReyndu aÃ° endurrÃ¦sa Tails til aÃ° athuga aftur meÃ° uppfÃ¦rslur.\n\nEÃ°a uppfÃ¦rÃ°u handvirkt.\nSkoÃ°aÃ°u 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 "villa:"
 
@@ -1378,65 +1390,73 @@ msgstr "Gat ekki bÃ¦tt viÃ° skrÃ¡agÃ¡mnum %s: Rann Ãºt Ã¡ tÃma meÃ°an beÃ°iÃ° v
 msgid "Choose File Container"
 msgstr "Veldu skrÃ¡agÃ¡m"
 
-#: 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 "Viltu Ã alvÃ¶runni rÃ¦sa Ã³Ã¶rugga vafrann?"
 
-#: 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 "Netnotkun meÃ° Ã³Ã¶rugga netvafranum er <b>ekki nafnlaus</b>.\\nNotaÃ°u Ã³Ã¶rugga netvafrann aÃ°eins ef Ã¾aÃ° er nauÃ°synlegt, til dÃ¦mis\\nef Ã¾Ãº Ã¾arft aÃ° skrÃ¡ Ã¾ig inn til aÃ° virkja internettengingu."
 
-#: 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 "RÃ¦si Ã³Ã¶rugga netvafrann..."
 
-#: 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 "Ã?etta getur tekiÃ° dÃ¡lÃtinn tÃma, sÃ½ndu smÃ¡ Ã¾olinmÃ¦Ã°i."
 
-#: 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Ã¶Ã°va Ã³Ã¶rugga netvafrann..."
 
-#: 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 "Ã?etta getur tekiÃ° smÃ¡ tÃma, ekki er vÃst aÃ° hÃ¦gt sÃ© aÃ° rÃ¦sa Ã³Ã¶ruggan vafra fyrr enn Ã¾vÃ er lokiÃ°."
 
-#: 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 "MistÃ³kst aÃ° endurrÃ¦sa 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 "Ã?Ã¶ruggur vafri"
 
-#: 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 "AnnaÃ° tilvik af Ã³Ã¶rugga netvafranum er Ã gangi eÃ°a er veriÃ° aÃ° hreinsa upp eftir slÃkt. PrÃ³faÃ°u aftur eftir smÃ¡ 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 "MistÃ³kst aÃ° setja upp 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 "MistÃ³kst aÃ° stilla vafra."
 
-#: 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 "Enginn DNS-nafnaÃ¾jÃ³nn fÃ©kkst Ã gegnum DHCP eÃ°a var skilgreindur Ã NetkerfisstjÃ³ranum."
 
-#: 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 "MistÃ³kst aÃ° rÃ¦sa vafra."
 
@@ -1529,7 +1549,7 @@ msgstr "AuÃ°kenningar er krafist til aÃ° fjarlÃ¦gja pakka Ãºr viÃ°bÃ³tarhugbÃºna
 
 #: ../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 "LykilorÃ° kerfisstjÃ³rnunar"
 
@@ -1553,7 +1573,7 @@ msgid "Disable"
 msgstr "Gera Ã³virkt"
 
 #: ../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 "DulbÃºningur MAC-vistfangs"
 
@@ -1574,7 +1594,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Ekki dulbÃºa MAC-vistfÃ¶ng"
 
 #: ../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 "Stillingar netkerfis"
 
@@ -1597,52 +1617,81 @@ msgstr "Stilla Tor-brÃº eÃ°a staÃ°vÃ¦ran milliÃ¾jÃ³n (proxy)"
 msgid "Disable all networking"
 msgstr "Afvirkja alla netvinnslu"
 
+#: ../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 "Ã?Ãº munt setja upp Tor-brÃº og staÃ°vÃ¦ran milliÃ¾jÃ³n (proxy) sÃÃ°ar eftir aÃ° hafa tengst neti."
 
-#: ../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 "Velkomin Ã 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 "TungumÃ¡l og landsvÃ¦Ã°i"
 
-#: ../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 "SjÃ¡lfgefnar stillingar"
 
-#: ../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 "DulrituÃ° varanleg _gagnageymsla"
 
 #. 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 "Settu inn lykilfrasann til aÃ° aflÃ¦sa varanlegu gagnageymslunni"
 
-#: ../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 "Varanlega gagnageymslan Ã¾Ãn er Ã³lÃ¦st. EndurrÃ¦stu Tails til aÃ° lÃ¦sa henni aftur."
 
-#: ../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 "ViÃ°bÃ³t_arstillingar"
 
-#: ../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 "BÃ¦ta viÃ° aukastillingum"
 
-#: ../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 "SjÃ¡lfgefnar stillingar eru Ã flestum tilfellum nÃ³gu Ã¶ruggar. Til aÃ° bÃ¦ta viÃ° sÃ©rsniÃ°num stillingum, Ã½ttu Ã¡ \"+\" hnappinn hÃ©r fyrir neÃ°an."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "SlÃ¶kkva"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "RÃ¦_sa Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "SkrÃ¡agÃ¡mar"
diff --git a/it.po b/it.po
index bcbd290801..1719e6b3a3 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 "Aggiungi"
 msgid "Back"
 msgstr "Indietro"
 
-#: 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 "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 "Attivato"
+
+#: 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 "Arresto"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Avvia Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -485,28 +489,28 @@ msgstr "umount fallito con codice di ritorno {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "Sbloccaggio in corsoâ?¦"
 
-#: 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 "Sblocca"
 
-#: 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 "Impossibile sbloccare il volume cifrato con questa password."
 
-#: 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 "_Lingua"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Disposizione tastiera"
-
-#: 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 "_Disposizione tastiera"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -567,7 +571,7 @@ msgid "Passphrase can't be empty"
 msgstr "La frase segreta non puÃ² essere vuota"
 
 #: 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 "Mostra passphrase"
 
@@ -675,78 +679,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Mantenere i file in una directory \"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 "Segnalibri del browser"
 
-#: 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 "Segnalibri salvati nel browser 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 "Connessioni di rete"
 
-#: 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 "Configurazione dei dispositivi e delle connessioni di rete"
 
-#: 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 installato all'avvio di 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 "Stampanti"
 
-#: 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 "Configurazione stampanti"
 
-#: 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 "Email, feed e impostazioni di 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 "Portachiavi GnuPG e configurazione"
 
-#: 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 "Configurazione e portafoglio bitcoin di 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 "Profili Pidgin e portachiavi 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 "Chiavi SSH, configurazione e host conosciuti "
 
-#: 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 "Crea un symlink in $HOME per ogni file o cartella dentro la cartella \"dotfiles\""
@@ -763,7 +775,7 @@ msgstr "Configurare un volume persistente 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 "Errore"
 
@@ -866,7 +878,7 @@ msgid ""
 "{error}"
 msgstr "Importazione chiavi fallita da {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] "Chiave importata"
@@ -874,7 +886,7 @@ msgstr[1] "Chiavi importate"
 
 #. 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 "Password di amministrazione"
 
@@ -1578,7 +1598,7 @@ msgid "Disable"
 msgstr "Disabilita"
 
 #: ../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 "Spoofing indirizzo MAC"
 
@@ -1599,7 +1619,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Nessuno spoof degli indirizzi 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 "Configurazione di rete"
 
@@ -1622,52 +1642,81 @@ msgstr "Configura un bridge Tor od un proxy locale"
 msgid "Disable all networking"
 msgstr "Disattiva tutta l'attivitÃ  di rete"
 
+#: ../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 "Configurerai il bridge Tor e il proxy locale piÃ¹ tardi dopo la connessione a una rete."
 
-#: ../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 "Benvenuto in 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 "Lingua & Regione"
 
-#: ../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 "Impostazioni predefinite"
 
-#: ../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 "_Volume persistente cifrato"
 
 #. 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 "Aggiungi un'impostazione aggiuntiva"
 
-#: ../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 "Arresto"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Avvia Tails"
+
 #: ../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 40d35ce92f..884f937eff 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 "<h1>ã??ã?°ä¿®æ£ã?«å??å??ã??ã?¦ã??ã? ã??ã??ï¼?</h1>\n<p><a href=\"%s\">ã??ã?°ã?®å ±å??æ?¹æ³?</a>ã??èªã??ã?§ã??ã? ã??ã??ã??</p>\n<p><strong>ä¸?å¿?è¦?ã?ªå??äººæ??å ±ã??å?«ã??ã?ªã??ã?§ã??ã? ã??ã??ï¼?</strong></p>\n<h2>ã?¡ã?¼ã?«ã?¢ã??ã?¬ã?¹ã?®æ??ä¾?ã?«ã?¤ã??ã?¦</h2>\n<p>\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 "è¿½å? ã?½ã??ã??ã?¦ã?§ã?¢"
@@ -110,12 +110,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)"
 
@@ -398,54 +398,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 ""
@@ -482,28 +486,28 @@ msgstr "unmount ã??å¤±æ??ã??ã?¾ã??ã??ã??å??é??ã?³ã?¼ã??ã?¯ {returncode}:\n{stdou
 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 ""
@@ -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 "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 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 "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?"
 
-#: 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 "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 "Electrum ã?®Bitcoin ã?¦ã?©ã?¬ã??ã??ã?¨è¨å®?"
 
-#: 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 "`ã??ã??ã??ã??ã?¡ã?¤ã?«'ã??ã?£ã?¬ã?¯ã??ã?ªã?§è¦?ã?¤ã??ã?£ã??$HOMEã?®å??ã??ã?¡ã?¤ã?«ã??ã??ã?£ã?¬ã?¯ã??ã?ªã?¸ã?®ã?·ã?³ã??ã?ªã??ã?¯ã?ªã?³ã?¯"
@@ -760,7 +772,7 @@ msgstr "Talisã?®æ°¸ç¶?ç??ã??ã?ªã?¥ã?¼ã? ã??ã?»ã??ã??ã?¢ã??ã??"
 #: 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 "<b>ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã?®ç¢ºèª?ã?«å??å??ã?ªã?¡ã?¢ã?ªã??å?©ç?¨ã?§ã??ã?¾ã??ã??ã??</b>\n\nã??ã?®ã?·ã?¹ã??ã? ã?? Tails ã?®å??ä½?ã??ã??è¦?ä»¶ã??æº?ã??ã??ã?¦ã??ã??ã??ç¢ºèª?ã??ã?¦ã??ã? ã??ã??ã??\nfile:///usr/share/doc/tails/website/doc/about/requirements.en.html ã??ã??è¦§ã??ã? ã??ã??ã??\n\nTails ã??å??èµ·å??ã??ã?¦ã??ã??ã??ã??ã??ä¸?åº¦ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã??ç¢ºèª?ã??ã?¦ã??ã? ã??ã??ã??\n\nã?¾ã??ã?¯ã??æ??å??ã?§ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã??è¡?ã?£ã?¦ã??ã? ã??ã??ã??\nhttps://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 "ã?¨ã?©ã?¼:"
 
@@ -1398,65 +1410,73 @@ msgstr "ã??ã?¡ã?¤ã?«ã?³ã?³ã??ã??%sã??è¿½å? ã?§ã??ã?¾ã??ã??ã?§ã??ã??ï¼?ã?«ã?¼ã??
 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çµ?ç?±ã?§å??å¾?ã??ã??ã??ã??ã??ã?¾ã??ã?¯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 "ã??ã?©ã?¦ã?¶ã?¼ã??èµ·å??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
@@ -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 "MAC ã?¢ã??ã?¬ã?¹ã?¹ã??ã?¼ã??ã?£ã?³ã?°"
 
@@ -1594,7 +1614,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 "ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?"
 
@@ -1617,52 +1637,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/ka.po b/ka.po
index 7ca813a4a1..5b2f8d6d18 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 "<h1>á??á??á??á??á??á?®á??á??á? á??á?? á?®á??á? á??á??á??á??á??á??á?¡ á??á?¦á??á??á?¤á?®á??á? á??á?¨á??!</h1>\n<p>á?¬á??á??á??á??á??á?®á??á??<a href=\"%s\">á?©á??á??á??á?? á??á??á??á??á??á??á??á??á??á?? á?®á??á? á??á??á??á??á??á??á?¡ á??á??á?®á?¡á??á??á??á??á??á??á??</a>.</p>\n<p><strong>á??á??á?®á?¡á??á??á??á??á??á?¡ á??á?£ á??á??á?£á? á??á??á??á?? á??á??á??á??á??á?¢ á??á??á? á??á?? á??á??á?¤á??á? á??á??á?ªá??á??á?¡!</strong></p>\n<h2>á??á??á?¡á?¤á??á?¡á?¢á??á?¡ á??á??á?¬á??á??á??á??á??á?¡ á??á??á??á??á??á??á??</h2>\n<p>\ná??á??á?¤á??á?¡á?¢á??á?¡ á??á??á?¡á??á??á??á? á??á??á?¡ á??á??á?¬á??á??á??á??á??á??, á?¡á??á?¨á?£á??á??á??á??á?? á??á??á??á??á??á?ªá??á??á?? á??á??á??á??á??á??á??á?¨á??á? á??á??á??\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 "á??á??á??á??á?¢á??á??á??á??á?? á??á? á??á??á? á??á??á??"
@@ -90,12 +90,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 "_á??á??á?®á?£á? á??á??"
 
@@ -378,54 +378,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 ""
@@ -462,28 +466,28 @@ msgstr "umount á??á?  á??á?£á?¨á??á??á??á?¡, á?¨á??á?ªá??á??á??á??á?¡ á??á??á??
 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 ""
@@ -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 "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 "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 "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 "á?¡á??á??á??á??á??á?£á? á?? á??á??á?£á??á??á??á?? $HOME á?¡á??á?¥á??á?¦á??á??á??á??á?¨á??, `dotfiles'Â  á?¡á??á?¥á??á?¦á??á??á??á??á?¨á?? á??á? á?¡á??á??á?£á??á?? á??á??á??á??á??á?£á??á?? á?¤á??á??á??á??á?¡á?? á??á?? á?¥á??á??á?¡á??á?¥á??á?¦á??á??á??á??á?¡"
@@ -740,7 +752,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 "á?¨á??á?ªá??á??á??á??"
 
@@ -843,7 +855,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] "á??á??á?¡á??á?¦á??á??á?? á??á??á??á??á??á?¢á??á??á??á??á??á??"
@@ -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 "\"<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 "á?¨á??á?ªá??á??á??á??:"
 
@@ -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 "á?¥á?¡á??á??á?¨á?? á??á??á?¥á??á??á??á??á??á??á??á?? á??á??á?£á?ªá??á??á??á?? á??á? á??á?£á??á??á? á??á?? <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 "á??á? á??á?£á??á??á? á??á?¡ á??á??á?¨á??á??á??á?? á??á??á?  á??á??á?®á??á? á?®á??á??."
 
@@ -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 "MAC-á??á??á?¡á??á??á??á? á??á??á?¡ á??á??á??á??á??á??á??á??á??á??"
 
@@ -1576,7 +1596,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 "á?¥á?¡á??á??á??á?¡ á??á??á??á??á? á??á??á??"
 
@@ -1599,52 +1619,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/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 b60bbbabc4..12c3fa95a0 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 "<h1>Ò?Ð°Ñ?ÐµÐ½Ñ? Ñ?Ò¯Ð·ÐµÑ?Ñ?Ð³Ðµ ÐºÓ©Ð¼ÐµÐºÑ?ÐµÑ?Ñ?Ò£Ñ?Ð·!</h1>\n<p><a href=\"%s\">Ò?Ð°Ñ?ÐµÐ»ÐµÑ? Ñ?Ñ?Ñ?Ð°Ð»Ñ? ÐµÑ?ÐµÐ¿ Ð±ÐµÑ?Ñ? Ð½Ò±Ñ?Ò?Ð°Ñ?Ð»Ð°Ñ?Ñ?Ð½</a> Ð¾Ò?Ñ?Ò£Ñ?Ð·.</p>\n<p><strong>Ð?Ò±Ð´Ð°Ð½ Ð°Ñ?Ñ?Ñ?Ò? Ð¶ÐµÐºÐµ Ð°Ò?Ð¿Ð°Ñ?Ð°Ñ?Ñ?Ñ? Ò?Ð°Ð¼Ñ?Ñ?Ð¼Ð°Ò£Ñ?Ð·\nÒ?Ð°Ð¶ÐµÑ? Ð±Ð¾Ð»Ð´Ñ?!</strong></p>\n<h2>ÐÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ?Ð½ Ð±ÐµÑ?Ñ? Ñ?Ñ?Ñ?Ð°Ð»Ñ?</h2>\n<p>\nÐ?Ñ?Ð·Ð³Ðµ Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ?Ð½ Ð±ÐµÑ?Ñ? Ð±Ò±Ð» Ð¼Ó?Ñ?ÐµÐ»ÐµÐ½Ñ? Ñ?Ò¯Ñ?Ñ?Ð½Ð´Ñ?Ñ?Ñ? Ò¯Ñ?Ñ?Ð½ Ñ?Ñ?Ð·Ð±ÐµÐ½ Ð±Ð°Ð¹Ð»Ð°Ð½Ñ?Ñ?Ñ?Ò?Ð° Ð¼Ò¯Ð¼ÐºÑ?Ð½Ð´Ñ?Ðº Ð±ÐµÑ?ÐµÐ´Ñ?.Ð?Ò±Ð»\nÐµÑ?ÐµÐ¿Ñ?ÐµÑ?Ð´Ñ?Ò£ Ð±Ð°Ñ?Ñ?Ð¼ ÐºÓ©Ð¿Ñ?Ñ?Ð»Ñ?Ð³Ñ? Ò¯Ñ?Ñ?Ð½ Ð±Ñ?Ð· ÐºÓ©Ð¿Ñ?ÐµÐ³ÐµÐ½ ÐµÑ?ÐµÐ¿Ñ?ÐµÑ? Ñ?ÐµÑ?Ñ?Ð½Ð´Ðµ Ò?Ð°Ð±Ñ?Ð»Ð´Ð°Ð¹Ð¼Ñ?Ð· ÐµÑ?Ò?Ð°Ð½Ð´Ð°Ð¹ Ð±Ð°Ð¹Ð»Ð°Ð½Ñ?Ñ? Ð°Ò?Ð¿Ð°Ñ?Ð°Ñ?Ñ?Ð½Ñ?Ñ?Ð· Ð¿Ð°Ð¹Ð´Ð°Ñ?Ñ?Ð·.Ð?ÐºÑ?Ð½Ñ?Ñ? Ð¶Ð°Ò?Ñ?Ð½Ð°Ð½, Ð¾Ð» Ð´Ð° Ò?Ð°Ð¼Ñ?Ð°Ð¼Ð°Ñ?Ñ?Ð· ÐµÑ?ÐµÐ´Ñ?\nÑ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ò£Ñ?Ð· Ð½ÐµÐ¼ÐµÑ?Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ?Ñ?Ò£Ñ?Ð· Ñ?Ð¸Ñ?Ò?Ñ?Ñ?, Ñ?
 Ñ?Ò£Ð´Ð°Ñ? Ò?Ò±Ñ?Ñ?Ð»Ò?Ñ?Ð»Ð°Ñ?Ñ? Ò¯Ñ?Ñ?Ð½ Ð¼Ò¯Ð¼ÐºÑ?Ð½Ð´Ñ?ÐºÑ?ÐµÑ?\nTails Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ð°Ñ?Ñ?Ð½Ñ?Ò£Ñ?Ð·Ð´Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ò£Ñ?Ð·.\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 "Ò?Ð¾Ñ?Ñ?Ð¼Ñ?Ð° Ð±Ð°Ò?Ð´Ð°Ñ?Ð»Ð°Ð¼Ð°"
@@ -89,12 +89,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 "_Ð¨Ñ?Ò?Ñ?"
 
@@ -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 "Â«Ð?Ð°Ò£Ð°Ñ?Ñ?Ñ?Ð»Ð°Ñ?Ð´Ñ? Ñ?ÐµÐºÑ?ÐµÑ?Ñ? Ò¯Ñ?Ñ?Ð½ Ð¶Ð°Ð´ Ð¶ÐµÑ?ÐºÑ?Ð»Ñ?ÐºÑ?Ñ?Ð·.\n\nÐ?Ò±Ð» Ð¶Ò¯Ð¹ÐµÐ½Ñ?Ò£ Ð?Ò¯Ñ?Ñ?ÐµÑ?Ð´Ñ? Ð¾Ñ?Ñ?Ð½Ð´Ð°Ñ? Ñ?Ð°Ð»Ð°Ð¿Ñ?Ð°Ñ?Ñ?Ð½ Ò?Ð°Ð½Ð°Ò?Ð°Ñ?Ñ?Ð°Ð½Ð´Ñ?Ñ?Ñ?Ñ?Ð½Ð° ÐºÓ©Ð· Ð¶ÐµÑ?ÐºÑ?Ð·Ñ?Ò£Ñ?Ð·.\nÒ?Ð°Ñ?Ð°Ò£Ñ?Ð·: 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 "Ò?Ð°Ñ?Ðµ:"
 
@@ -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 "Ò?Ð°Ñ?Ñ?Ð¿Ñ?Ñ?Ð· Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð´Ñ?Ò£ Ð¶ÐµÐ»Ñ?Ð»Ñ?Ðº Ó?Ñ?ÐµÐºÐµÑ?Ñ? <b>Ð¶Ð°Ñ?Ñ?Ñ?Ñ?Ð½ ÐµÐ¼ÐµÑ?</b>./n Ò?Ð°Ð¶ÐµÑ? Ð±Ð¾Ð»Ñ?Ð°, Unsafe Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð°Ð½Ð° Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ò£Ñ?Ð·, Ð¼Ñ?Ñ?Ð°Ð»Ñ? \\nif Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ò?Ð¾Ñ?Ñ?Ð»Ñ?Ð¼Ñ?Ò£Ñ?Ð·Ð´Ñ? Ñ?Ñ?ÐºÐµ Ò?Ð¾Ñ?Ñ? Ò¯Ñ?Ñ?Ð½ ÐºÑ?Ñ?Ñ?Ð³Ðµ Ð½ÐµÐ¼ÐµÑ?Ðµ Ñ?Ñ?Ñ?ÐºÐµÐ»Ñ?Ð³Ðµ Ñ?Ñ?Ñ?Ð° ÐºÐµÐ»ÐµÐ´Ñ?."
 
-#: 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 "Unsafe Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ñ? Ò?Ð¾Ñ?Ñ?Ð»Ñ?Ð´Ð°..."
 
-#: 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 "Unsafe Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð´Ñ? Ó©Ñ?Ñ?Ñ?Ñ? ..."
 
-#: 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 "Ð?Ò±Ð» Ð±Ñ?Ñ?Ð°Ð· Ñ?Ð°Ò?Ñ?Ñ? ÐºÐµÑ?Ñ?Ñ? Ð¼Ò¯Ð¼ÐºÑ?Ð½, Ñ?Ð¾Ð½Ð´Ñ?Ò?Ñ?Ð°Ð½ Ð¾Ð» Ð´Ò±Ñ?Ñ?Ñ? Ð¶Ð°Ð±Ñ?Ð»Ð¼Ð°Ð¹Ñ?Ð½Ñ?Ð°, Unsafe Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð´Ñ? Ò?Ð°Ð¹Ñ?Ð° Ñ?Ñ?ÐºÐµ Ò?Ð¾Ñ?Ð° Ð°Ð»Ð¼Ð°Ð¹Ñ?Ñ?Ð·."
 
-#: 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 "Unsafe Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?,Ñ?Ò?Ð½Ð¸ Ò?Ð°Ñ?Ñ?Ð¿Ñ?Ñ?Ð· Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?"
 
-#: 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 "Ò?Ð°Ð·Ñ?Ñ?Ð³Ñ? Ñ?Ð°Ò?Ñ?Ñ?Ñ?Ð° Ñ?Ð°Ò?Ñ? Ð±Ñ?Ñ? Unsafe Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð¶Ò±Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?ÐµÐ¹Ð´Ñ? Ð½ÐµÐ¼ÐµÑ?Ðµ Ñ?Ð°Ð·Ð°Ñ?Ñ?Ñ?Ð»Ð°Ð´Ñ?. Ð?Ñ?Ñ?Ð°Ð·Ð´Ð°Ð½ ÐºÐµÐ¹Ñ?Ð½ Ò?Ð°Ð¹Ñ?Ð°Ð»Ð°Ð¿ ÐºÓ©Ñ?Ñ?Ò£Ñ?Ð·."
 
-#: 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 Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð°Ð»Ñ?Ð½Ð±Ð°Ð´Ñ? Ð½ÐµÐ¼ÐµÑ?Ðµ 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 "Ð?Ñ?Ð°Ñ?Ð·ÐµÑ?Ð´Ñ? Ñ?Ñ?ÐºÐµ Ò?Ð¾Ñ?Ñ? Ñ?Ó?Ñ?Ñ?Ñ?Ð· Ð°Ñ?Ò?Ñ?Ð°Ð»Ð´Ñ?."
 
@@ -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 5576e40fe0..95dadc1f88 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,54 +377,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 ""
 
-#: 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 ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -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 "á?²á??á??â??á?¯á??á??á?¶á??â??á??á??â??á??á?»á??â??á??á??á??á?»á??â??á??á?? `Persistent'"
 
 #: 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 "Browser Bookmarks"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+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: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 ""
 
-#: 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 "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 keyrings á??á?·á??â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á??á??á??"
 
-#: 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 "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 keyring"
 
-#: 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 "Symlink á??á??â??á??á??á??á?»á?? $HOME á??á?¼á??â??á??á?¶á??á??â??á?¯á??á??á?¶á?? á?¬â??á??á??â??á??á??á??â??á??á?¶á??â??á??á??â??á??á?¾á??â??á??á??â??á??á??á??á?»á??â??á??á?? `dotfiles'"
@@ -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 538315f14c..606fd182af 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,54 +376,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 c339ca5755..5691030f55 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 "<h1>ì?°ë¦¬ê°? ë²?ê·¸ë¥¼ ì??ì ?í?  ì?? ì??ë??ë¡? ë??ì??ì£¼ì?¸ì??! <h1>\n<p><a href=\"%s\">ë²?ê·¸ ë¦¬í?¬í?? ì§?ì¹¨ì??</a>ë¥¼ ì°¸ì¡°í??ì?¸ì??.</p>\n<p><strong>í??ì??í?? ê²? ì?´ì??ì?? ê°?ì?¸ì ?ë³´ë¥¼ í?¬í?¨í??ì??ì§? ë§?ì?¸ì??!</strong></p>\n<h2>ì?°ë¦¬ê°? ì?´ë©?ì?¼ ì£¼ì??ë¥¼ ë°?ë?? ì?´ì? </h2>\n<p>\nì?°ë¦¬ê°? ì?´ë©?ì?¼ ì£¼ì??ë¥¼ ë°?ë?? ê²?ì?? ë¬¸ì ?ë¥¼ ëª?í??í??ê²? í??ê¸° ì??í?´ ì?°ë?½ì?? í?  ì?? ì??ê¸° ë??ë¬¸ì??ë??ë?¤.\nì?°ë¦¬ê°? ë°?ë?? ë??ë¶?ë¶?ì?? ë¦¬í?¬í??ì?? ì?°ë?½ì²? ì ?ë³´ê°? í??ì??í?©ë??ë?¤ë§?, ê·¸ë?°ê²?ë?¤ì?? ì?¼ë¶?ë?? ì?°ë?½ì²? \nì ?ë³´ê°? ì??ë?? ê²½ì?°ê°? ì??ê¸° ë??ë¬¸ì??ë??ë?¤. ë?¤ë¥¸ í??í?¸ì?¼ë¡?ë?? ë?¹ì? ì?´ Tailsë¥¼ ì?¬ì?©í??ì?¬ ì?´ë©?ì?¼ì?´ë?? \nì?¸í?°ë?· ì ?ê³µì??ì²?ë?¼ ë??ì²ì??ì??ë??í?? í??ì?¸í?  ì?? ì??ë?? ê¸°í??ë¥¼ ì ?ê³µí??ê¸° ì??í?¨ì??ë??ë?¤.\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 "_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"
 
@@ -383,54 +383,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 ""
@@ -467,28 +471,28 @@ msgstr "umount failed with return code {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 "_ì?¸ì?´"
 
-#: 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 ""
@@ -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 "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 "ì¦?ê²¨ì°¾ê¸° ì¶?ê°?ì??ë£?"
 
-#: 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 "í??ì?¼ì¦? ì??ì??í? ë?? ì?¤ì¹?ë?? ì??í??í?¸ì?¨ì?´"
 
-#: 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 "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 "ì?¼ë ?í?¸ë?¼ì?? ë¹?í?¸ì½?ì?¸ ì§?ê°? ë°? ì?¤ì ?"
 
-#: 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 "`ë??í?¸ í??ì?¼ 'ë??ë ?í? ë¦¬ì?? ì??ë?? $HOMEì?? ê°? í??ì?¼ì?´ë?? ë??ë ?í? ë¦¬ì?? ë??í?? ì?¬ë³¼ë¦ ë§?í?¬"
@@ -745,7 +757,7 @@ msgstr "Talisì?? ì??êµ¬ì ? ë³¼ë¥¨ì?? ì?¤ì ?"
 #: 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 "<b>ì??ê·¸ë ?ì?´ë?? í??ì?¸ì?? ì¶©ë¶?í?? ë©?ëª¨ë¦¬ë¥¼ ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤.</b>\n\nì?´ ì??ì?¤í??ì?´ Tailsì?? ì??ë?? ì??êµ¬ ì?¬í?ì?? ì¶©ì¡±í??ë??ì§? í??ì?¸í??ì?ì??ì?¤.\nfile:///usr/share/doc/tails/website/doc/about/requirements.en.htmlë¥¼ ì°¸ì¡°í??ì?ì??ì?¤.\n\nTailsë¥¼ ë?¤ì?? ì??ì??í??ê³  ë?¤ì?? ì??ê·¸ë ?ì?´ë??ë¥¼ í??ì?¸í??ì?ì??ì?¤.\n\në??ë?? ì??ë??ì?¼ë¡? ì??ê·¸ë ?ì?´ë??í?´ì?¼í?©ë??ë?¤.\nhttps://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 "ì?¤ë¥?:"
 
@@ -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 "ì??ì ?í??ì§? ì??ì?? ë¸?ë?¼ì?°ì ¸ë¡? í??ë?? ë?¤í?¸ì??í?¬ ì?°ê²°ì?? <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ë¥¼ í?µí?´ ê²?ì??í??ê±°ë?? 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 "ë¸?ë?¼ì?°ì ?ë¥¼ ì?¤í??ì??í?¤ì§? ëª» í??ì?µë??ë?¤."
 
@@ -1534,7 +1554,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 "ê´?ë¦¬ ë¹?ë°?ë²?í?¸"
 
@@ -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 "MAC ì£¼ì?? ì?¤í?¸í??"
 
@@ -1579,7 +1599,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 "ë?¤í?¸ì??í?¬ ì?¤ì ?"
 
@@ -1602,52 +1622,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/lt.po b/lt.po
index 3693f63ed5..6045846f7a 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 "<h1>PadÄ?kite mums pataisyti jÅ«sÅ³ klaidÄ?!</h1>\n<p>Perskaitykite <a href=\"%s\">mÅ«sÅ³ praneÅ¡imÅ³ apie klaidas instrukcijas</a>.</p>\n<p><strong>NeÄ¯traukite daugiau asmeninÄ?s informacijos, negu yra reikalinga!</strong></p>\n<h2>Apie jÅ«sÅ³ el. paÅ¡to adreso pateikimÄ? mums</h2>\n<p>\nJÅ«sÅ³ el. paÅ¡to adreso pateikimas mums, leidÅ¾ia mums susisiekti su jumis, norint\npasitikslinti problemÄ?. Tai yra reikalinga daugelyje mÅ«sÅ³ gaunamÅ³ praneÅ¡imÅ³ apie\nklaidas, kadangi dauguma praneÅ¡imÅ³ be kontaktinÄ?s informacijos yra nenaudingi.\nKita vertus tai suteikia galimybÄ? slapta pasiklausantiems asmenims, kaip pavyzdÅ¾iui,\njÅ«sÅ³ el. paÅ¡to ar interneto tiekÄ?jui, pasitvirtinti, jog naudojate 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 "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 "Pa_leisti"
 
 #: 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 "IÅ¡_eiti"
 
@@ -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 "Tiesioginis (numatytasis)"
 
-#: 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 "TinklÅ³ tiltas ir Ä¯galiotasis serveris"
 
-#: 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 "Nepasiekiama(-s)"
 
-#: 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 "Ä®jungta"
+
+#: 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 "Ä®jungta (numatytasis)"
 
-#: 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 "IÅ¡jungta (numatytasis)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "IÅ¡jungti"
-
-#: 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 "umount patyrÄ? nesÄ?kmÄ? su grÄ¯Å¾ties kodu {returncode}:\n{stdout}\n{st
 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 "Nepavyksta su Å¡ia slaptafraze atrakinti ilgalaikio kaupiklio."
 
-#: 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 "SlaptafrazÄ? negali bÅ«ti tuÅ¡Ä?ia"
 
 #: 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 "Rodyti slaptafrazÄ?"
 
@@ -652,78 +656,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "IÅ¡saugoti failus, esanÄ?ius \"Ilgalaikiame\" kataloge"
 
 #: 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 "NarÅ¡yklÄ?s adresyno Ä¯raÅ¡ai"
 
-#: 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 NarÅ¡yklÄ?je Ä¯raÅ¡yti adresyno Ä¯raÅ¡ai"
 
-#: 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 "Tinklo ryÅ¡iai"
 
-#: 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 "Tinklo Ä¯renginiÅ³ ir ryÅ¡iÅ³ konfigÅ«racija"
 
-#: 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 "PrograminÄ? Ä¯ranga, Ä¯diegiama, paleidÅ¾iant 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 "Spausdintuvai"
 
-#: 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 "SpausdintuvÅ³ konfigÅ«racija"
 
-#: 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 el. laiÅ¡kai, kanalai ir nustatymai"
 
-#: 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 raktinÄ?s ir konfigÅ«racija "
 
-#: 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 kliento programa"
 
-#: 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 piniginÄ? ir konfigÅ«racija"
 
-#: 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 profiliai ir OTR raktinÄ?"
 
-#: 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 klientas"
 
-#: 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 raktai, konfigÅ«racija ir Å¾inomi serveriai"
 
-#: 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 "PaslÄ?pti failai"
 
-#: 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 "Sukurti kiekvieno paslÄ?ptÅ³ failÅ³ kataloge esanÄ?io failo ar katalogo simbolinÄ? nuorodÄ? Ä¯ $HOME"
@@ -740,7 +752,7 @@ msgstr "Nustatyti Tails ilgalaikÄ¯ tomÄ?"
 #: 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 "Nepavyko pridÄ?ti failÅ³ konteinerio %s: Laukiant ciklinÄ?s sÄ?rankos, p
 msgid "Choose File Container"
 msgstr "Pasirinkti failÅ³ konteinerÄ¯"
 
-#: 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 "Tinklo veikla nesaugioje narÅ¡yklÄ?je <b>nÄ?ra anoniminÄ?</b>.\\nNaudokite NesaugiÄ? narÅ¡yklÄ? tik tuomet, jeigu to reikia, pavyzdÅ¾iui,\\njeigu jums reikia prisijungti ar prisiregistruoti, kad aktyvuotumÄ?te savo interneto ryÅ¡Ä¯."
 
-#: 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 "Tai gali Å¡iek tiek uÅ¾trukti, praÅ¡ome bÅ«ti kantriais."
 
-#: 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 "Nesaugi narÅ¡yklÄ? iÅ¡jungiama..."
 
-#: 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 "Tai gali Å¡iek tiek uÅ¾trukti. JÅ«s neturite iÅ¡ naujo paleisti nesaugios narÅ¡yklÄ?s tol, kol ji nebus tinkamai iÅ¡jungta."
 
-#: 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 "Å iuo metu veikia ar yra iÅ¡valoma kita nesaugi narÅ¡yklÄ?. Å iek tiek palaukite ir bandykite dar kartÄ?."
 
-#: 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 "Nepavyko nustatyti 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 "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 "Joks DNS serveris nebuvo gautas per DHCP ar sukonfigÅ«ruotas rankiniu bÅ«du programoje 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 "Nepavyko paleisti narÅ¡yklÄ?s."
 
@@ -1535,7 +1555,7 @@ msgstr "Reikalingas tapatybÄ?s nustatymas, norint paÅ¡alinti paketÄ? iÅ¡ jÅ«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 "Administravimo slaptaÅ¾odis"
 
@@ -1559,7 +1579,7 @@ msgid "Disable"
 msgstr "IÅ¡jungti"
 
 #: ../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 adresÅ³ klastojimas"
 
@@ -1580,7 +1600,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Neklastoti MAC adresus"
 
 #: ../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 "Tinklo konfigÅ«ravimas"
 
@@ -1603,52 +1623,81 @@ msgstr "KonfigÅ«ruoti Tor tinklÅ³ tiltÄ? ar vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯"
 msgid "Disable all networking"
 msgstr "IÅ¡jungti visÄ? darbÄ? tinkle"
 
+#: ../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 "JÅ«s sukonfigÅ«ruosite Tor tinklÅ³ tiltÄ? ir vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯ vÄ?liau, po prisijungimo prie tinklo."
 
-#: ../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 "Sveiki atvykÄ? Ä¯ 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 "Kalba ir regionas"
 
-#: ../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 "Numatytieji nustatymai"
 
-#: ../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 "Å ifruotas ilgalaikis kau_piklis"
 
 #. 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 "Ä®veskite savo slaptafrazÄ?, kad atrakintumÄ?te ilgalaikÄ¯ kaupiklÄ¯"
 
-#: ../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 "JÅ«sÅ³ ilgalaikis kaupiklis yra atrakintas. Paleiskite Tails iÅ¡ naujo, norÄ?dami jÄ¯ vÄ?l uÅ¾rakinti. "
 
-#: ../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 "P_apildomi nustatymai"
 
-#: ../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 "PridÄ?ti papildomÄ? nustatymÄ?"
 
-#: ../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 "Numatytieji nustatymai daugelyje situacijÅ³ yra saugÅ«s. NorÄ?dami pridÄ?ti pasirinktinÄ¯ nustatymÄ?, Å¾emiau spustelÄ?kite mygtukÄ? \"+\"."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "IÅ¡jungti"
+
+#: ../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 "FailÅ³ konteineriai"
diff --git a/lv.po b/lv.po
index 276695912d..c8ee13d223 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 "<h1>PalÄ«dziet mums novÄ?rst JÅ«su kÄ¼Å«du!</h1>\n<p>Lasiet <a href=\"%s\">mÅ«su kÄ¼Å«das pieteikÅ¡anas norÄ?dÄ«jumus</a>.</p>\n<p><strong>NeiekÄ¼aujiet vairÄ?k personiskÄ?s informÄ?cijas nekÄ? ir nepiecieÅ¡ams!</strong></p>\n<h2>Par JÅ«su e-pasta adreses norÄ?dÄ«Å¡anu mums</h2>\n<p>\nNorÄ?dot savu e-pasta adresi, JÅ«s dodat mums iespÄ?ju sazinÄ?ties ar Jums, lai apzinÄ?tu problÄ?mu. Vairumam pieteikumu tas ir nepiecieÅ¡ams, jo liela daÄ¼a pieteikumu bez kontaktinformÄ?cijas nav atrisinÄ?ma. No otras puses, e-pasta norÄ?dÄ«Å¡ana paver iespÄ?ju tiem kas noklausÄ?s, piemÄ?ram, e-pasta vai interneta pakalpojumam sniedzÄ?jiem, pÄ?rliecinÄ?ties, ka lietojat 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 ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Vai vienalga vÄ?laties startÄ?t 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 "_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"
 
@@ -377,54 +377,58 @@ msgstr "Pievienot"
 msgid "Back"
 msgstr "AtpakaÄ¼"
 
-#: 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 "_Administratora parole"
 
-#: 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 adreÅ¡u imitÄ?Å¡ana"
 
-#: 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 "_TÄ«kla savienojums"
 
-#: 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 "TieÅ¡s (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: 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 "Tilti un starpniekserveri"
 
-#: 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 "BezsaistÄ?"
 
-#: 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 "IespÄ?jots"
+
+#: 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 "IeslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: 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 "IeslÄ?gt"
 
-#: 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 "IzslÄ?gt"
 
-#: 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 "IzslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "IzslÄ?gÅ¡ana"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Palaist Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -461,28 +465,28 @@ msgstr "umount neizdevÄ?s, norÄ?dÄ«tais kods {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "AtslÄ?dz..."
 
-#: 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 "AtslÄ?gt"
 
-#: 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 "Ar Å¡o paroles frÄ?zi nav iespÄ?jams atbloÄ·Ä?t Å¡ifrÄ?to krÄ?tuvi. "
 
-#: 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 "_Valoda"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_KlaviatÅ«ras izkÄ?rtojums"
-
-#: 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Ä?ts"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_KlaviatÅ«ras izkÄ?rtojums"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr "Ieejas frÄ?ze nedrÄ«kst bÅ«t tukÅ¡a"
 
 #: 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 "ParÄ?dÄ«t paroles frÄ?zi"
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "PaturÄ?t \"PastÄ?vÄ«gajÄ?\" direktorijÄ? saglabÄ?tÄ?s datnes"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "PÄ?rlÅ«kÄ? Tor saglabÄ?tÄ?s grÄ?matzÄ«mes"
 
-#: 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 "T'Ä«kla savienojumi"
 
-#: 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 "Savienojumu un tÄ«kla ierÄ«Ä?u konfigurÄ?Å¡ana "
 
-#: 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 ""
 
-#: 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 "Printeri"
 
-#: 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 "Printeru konfigurÄ?Å¡ana"
 
-#: 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 ""
 
-#: 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 atslÄ?gu turÄ?tÄ?ji un konfigurÄ?Å¡ana"
 
-#: 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'a bitcoin maciÅ?Å¡ un konfigurÄ?cija"
 
-#: 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 "PidÅ¾invaloda"
 
-#: 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 "PidÅ¾invalodu profili un OTR atslÄ?gu turÄ?tÄ?js"
 
-#: 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 klients"
 
-#: 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 atslÄ?gas, konfigurÄ?cija un zinÄ?mi resursdatori"
 
-#: 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 "Punktdatnes"
 
-#: 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 "Visas datnes un direktorijas no `punktdatÅ?u' direktorija Symlink'ot uz $HOME  "
@@ -739,7 +751,7 @@ msgstr "IestatÄ«t Tails pastÄ?vÄ«bas sÄ?jumu"
 #: 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 "KÄ¼Å«da"
 
@@ -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 "kÄ¼Å«da:"
 
@@ -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 "Vai tieÅ¡Ä?m vÄ?laties palaist NedroÅ¡u pÄ?rlÅ«ku?"
 
-#: 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 "TÄ«kla aktivitÄ?te NedroÅ¡Ä? pÄ?rlÅ«kÄ? <b>nav anonÄ«ma</b>. Lietojiet NedroÅ¡u pÄ?rlÅ«ku tikai tad, kad nepiecieÅ¡ams, piemÄ?ram, ja Jums jÄ?iereÄ£istrÄ?jas vai jÄ?reÄ£istrÄ?jas, lai aktivizÄ?tu JÅ«su interneta savienojumu."
 
-#: 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 "StartÄ? NedroÅ¡u pÄ?rlÅ«ku..."
 
-#: 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 "Tas var ilgt kÄ?du laiku, tÄ?pÄ?c, lÅ«dzu, esiet pacietÄ«gs."
 
-#: 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 "IzslÄ?dz NedroÅ¡u pÄ?rlÅ«ku..."
 
-#: 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 "DarbÄ«bas pabeigÅ¡anai vÄ?l ir nepiecieÅ¡ams kÄ?ds laiks. NedrÄ«kst pÄ?rstartÄ?t NedroÅ¡o pÄ?rlÅ«ku, kamÄ?r tas tiek pareizi izslÄ?gts."
 
-#: 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 "NeizdevÄ?s pÄ?rstartÄ?t Tor'u."
 
-#: 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 "NedroÅ¡s pÄ?rlÅ«ks"
 
-#: 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 "Å obrÄ«d darbojas vai tiek attÄ«rÄ«ts cits nedroÅ¡s pÄ?rlÅ«ks. LÅ«dzu mÄ?Ä£iniet vÄ?lÄ?k vÄ?lreiz."
 
-#: 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 "NeizdevÄ?s iestatÄ«t 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 "NeizdevÄ?s nokonfigurÄ?t pÄ?rlÅ«ku."
 
-#: 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 "Izmantojot DHCP netika iegÅ«ts neviens DNS serveris; arÄ« NetworkManager'Ä« neviens DNS serveris nebija manuÄ?li nokonfigurÄ?ts.  "
 
-#: 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 "NeizdevÄ?s startÄ?t pÄ?rlÅ«ku."
 
@@ -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 "AdministrÄ?Å¡anas parole"
 
@@ -1556,7 +1576,7 @@ msgid "Disable"
 msgstr "AtspÄ?jot"
 
 #: ../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 adreses maldinoÅ¡a maiÅ?a"
 
@@ -1577,7 +1597,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "MaldinoÅ¡i nenorÄ?dÄ«t MAC adreses"
 
 #: ../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 "TÄ«kla konfigurÄ?Å¡ana"
 
@@ -1600,52 +1620,81 @@ msgstr "KonfigurÄ?t Tor tiltu vai vietÄ?jo starpniekserveri"
 msgid "Disable all networking"
 msgstr "AtspÄ?jot jebkÄ?du tÄ«kloÅ¡anu"
 
+#: ../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 "VÄ?lÄ?k, pÄ?c tam, kad izveidosit savienojumu ar tÄ«klu, JÅ«s konfigurÄ?sit Tor tiltu vai vietÄ?jo starpniekserveri."
 
-#: ../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 "SveicinÄ?ti 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 "Valoda un reÄ£ions"
 
-#: ../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 "NoklusÄ?juma iestatÄ«jumi"
 
-#: ../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 "Å ifrÄ?ta _PastÄ?vÄ«gÄ? uzglabÄ?Å¡ana"
 
 #. 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 "Ievadiet savu paroles frÄ?zi, lai atslÄ?gtu pastÄ?vÄ«go krÄ?tuvi"
 
-#: ../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 "JÅ«su pastÄ?vÄ«gÄ? krÄ?tuve ir atbloÄ·Ä?ta. RestartÄ?jiet Tails, lai to atkal bloÄ·Ä?tu."
 
-#: ../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 "_Papildu iestatÄ«jumi"
 
-#: ../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 "Pievienot papildu iestatÄ«jumu"
 
-#: ../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 "VairumÄ? gadÄ«jumu noklusÄ?juma vÄ?rtÄ«bas ir droÅ¡as. Lai pievienotu pielÄ?gotus iestatÄ«jumus, nospiediet tÄ?lÄ?k esoÅ¡o \"+\" pogu."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "IzslÄ?gÅ¡ana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Palaist Tails"
+
 #: ../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..93aec6a48e 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@xxxxxxxxx>\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@xxxxxxxxx>\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 56f3747d89..8c6992407b 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 "<h1>à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬à´?àµ? à´ªà´°à´¿à´¹à´°à´¿à´?àµ?à´?à´¾àµ» à´?à´?àµ?à´?à´³àµ? à´¸à´¹à´¾à´¯à´¿à´?àµ?à´?àµ?!</h1>\n<p>à´?à´?àµ?à´?à´³àµ?à´?àµ?<a href=\"%s\"> à´¬à´?àµ? à´±à´¿à´ªàµ?à´ªàµ?àµ¼à´?àµ?à´?à´¿à´?à´?àµ? à´¨à´¿àµ¼à´¦àµ?à´¦àµ?à´¶à´?àµ?à´?àµ¾ à´µà´¾à´¯à´¿à´?àµ?à´?àµ?à´?.</a></p>\n<p><strong>à´?à´µà´¶àµ?à´¯à´®àµ?à´³àµ?à´³à´¤à´¿à´¨àµ?à´?àµ?à´?à´¾àµ¾  à´?àµ?à´?àµ?à´¤àµ½ à´¸àµ?à´µà´?à´¾à´°àµ?à´¯ à´µà´¿à´µà´°à´?àµ?à´?àµ¾ à´?àµ¾à´ªàµ?à´ªàµ?à´?àµ?à´¤àµ?à´¤à´°àµ?à´¤àµ?</strong></p>\n<h2>à´?à´?àµ?à´?àµ¾à´?àµ?à´?àµ? à´?à´°àµ? à´?à´®àµ?à´¯à´¿àµ½ à´µà´¿à´²à´¾à´¸à´? à´¨àµ½à´?àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ?à´?àµ?à´?àµ?à´±à´¿à´?àµ?à´?àµ?</h2>\n<p>\nà´?à´?àµ?à´?àµ¾à´?àµ?à´?àµ? à´?à´°àµ? à´?à´®àµ?à´¯à´¿àµ½ à´µà´¿à´²à´¾à´¸à´? à´¨àµ½à´?àµ?à´¨àµ?à´¨à´¤àµ? à´ªàµ?à´°à´¶àµ?à´¨à´? à´µàµ?à´¯à´?àµ?à´¤à´®à´¾à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ? à´¨à´¿à´?àµ?à´?à´³àµ? à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?à´¾àµ» à´?à´?àµ?à´?à´³àµ? à´?à´¨àµ?à´µà´¦à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?.à´?\nà´®à´¿à´?àµ?à´? à´±à´¿à´ªàµ
 ?à´ªàµ?àµ¼à´?àµ?à´?àµ?à´?à´³à´¾à´¯à´¿ à´?à´?àµ?à´?àµ¾à´?àµ?à´?àµ? à´²à´à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´¬à´¹àµ?à´àµ?à´°à´¿à´ªà´?àµ?à´·à´? à´±à´¿à´ªàµ?à´ªàµ?àµ¼à´?àµ?à´?àµ?à´?àµ¾à´?àµ?à´?àµ?à´? à´?à´¤àµ? à´?à´µà´¶àµ?à´¯à´®à´¾à´£àµ?\nà´?à´°àµ? à´?àµ?àµºâ??à´?à´¾à´?àµ?à´±àµ?à´±àµ? à´µà´¿à´µà´°à´µàµ?à´®à´¿à´²àµ?à´²à´¾à´¤àµ? à´?à´ªà´¯àµ?à´?à´¶àµ?à´¨àµ?à´¯à´®à´¾à´£àµ?. à´®à´±àµ?à´µà´¶à´¤àµ?à´¤àµ? à´?à´¤àµ? à´¨àµ½à´?àµ?à´¨àµ?à´¨àµ?\nà´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?à´®àµ?à´¯à´¿àµ½ à´?à´²àµ?à´²àµ?à´?àµ?à´?à´¿àµ½ à´?àµ»à´±àµ¼à´¨àµ?à´±àµ?à´±àµ? à´¦à´¾à´¤à´¾à´µàµ? à´ªàµ?à´²àµ?à´³àµ?à´³ à´?à´³à´¿à´?àµ?à´?àµ?à´¨àµ?à´?àµ?à´?à´?àµ?à´?à´¾àµ¼à´?àµ?à´?àµ?à´³àµ?à´³ à´?à´µà´¸à´°à´?\nà´¨à´¿à´?àµ?à´?àµ¾ à´?àµ?àµ½à´¸àµ?  à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?à´µàµ?à´¨àµ?à´¨àµ? à´¸àµ?à´¥à´¿à´°àµ?à´?à´°à´¿à´?àµ?à´?àµ?à´?\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 "à´?à´§à´¿à´?à´®à´¾à´¯à´¿à´?àµ?à´?àµ?à´³àµ?à´³ à´¸àµ?à´«àµ?à´±àµ?à´µà´°àµ?à´¸àµ? "
@@ -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,54 +377,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 "_à´®à´¾à´?àµ?  à´µà´¿à´²à´¾à´¸à´? à´¸àµ?à´ªàµ?à´«à´¿à´?à´?àµ?"
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -461,28 +465,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 ""
@@ -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 "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 "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸à´±à´¿àµ½ à´¸àµ?à´µàµ? à´?àµ?à´¯àµ?à´¤à´¿à´?àµ?à´?àµ?à´³àµ?à´³ à´¬àµ?à´?àµ?à´?àµ? à´®à´¾àµ¼à´?àµ?à´¸àµ? "
 
-#: 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 "à´?àµ?àµ½à´¸àµ? à´¸àµ?à´±àµ?à´±à´¾àµ¼à´?àµ?à´?àµ? à´?àµ?à´¯àµ?à´¤à´ªàµ?à´ªàµ?àµ¾ à´?àµ»à´¸àµ?à´±àµ?à´±à´¾àµ¾ à´?àµ?à´¯àµ?à´¤à´¿à´?àµ?à´?àµ?à´³àµ?à´³ à´¸àµ?à´«àµ?à´?àµ?â??à´µàµ?à´¯àµ¼à´¸àµ?"
 
-#: 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 "à´?à´²à´?àµ?à´?à´±à´¾oà´¸àµ? à´¬à´¿à´±àµ?à´±àµ? à´?àµ?à´¯à´¿àµ» à´µà´¾à´²à´±àµ?à´±àµ?à´? à´¸à´?àµ?à´?àµ?à´?à´°à´£à´?àµ?à´?à´³àµ?à´?"
 
-#: 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 "\"<b>à´¨à´µàµ?à´?à´°à´£à´¤àµ?à´¤à´¿à´¨à´¾à´¯à´¿ à´ªà´°à´¿à´¶àµ?à´§à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ? à´®à´¤à´¿à´¯à´¾à´¯ à´®àµ?à´®àµ?à´®à´±à´¿ à´²à´àµ?à´¯à´®à´²àµ?à´².</b>\n\nà´?àµ?àµ½à´¸àµ? à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ?à´³àµ?à´³ à´?à´µà´¶àµ?à´¯à´?à´¤à´?àµ¾ à´? à´¸à´¿à´¸àµ?à´±àµ?à´±à´? à´¨à´¿à´±à´µàµ?à´±àµ?à´±àµ?à´¨àµ?à´¨àµ?à´µàµ?à´¨àµ?à´¨àµ? à´?à´±à´ªàµ?à´ªà´¾à´?àµ?à´?àµ?à´?.\nà´«à´¯àµ½ à´?à´¾à´£àµ?à´?  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 "à´ªà´¿à´¶à´?àµ?:"
 
@@ -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 "à´¸àµ?à´°à´?àµ?à´·à´¿à´¤à´®à´²àµ?à´²à´¾à´¤àµ?à´¤ à´¬àµ?à´°àµ?à´¸à´±à´¿à´²àµ? à´¨àµ?à´±àµ?à´±àµ?â??à´µàµ¼à´?àµ?à´?àµ? à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¨à´? <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 "à´?àµ?àµ¼ à´ªàµ?à´¨à´°à´¾à´°à´?à´à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿àµ½ à´ªà´°à´¾à´?à´¯à´ªàµ?à´ªàµ?à´?àµ?à´?àµ?."
 
-#: 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 "à´¬àµ?à´°àµ?à´¸àµ¼ à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿àµ½ à´ªà´°à´¾à´?à´¯à´ªàµ?à´ªàµ?à´?àµ?à´?àµ?."
 
@@ -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 "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 "à´¨àµ?à´±àµ?à´±àµ?â??à´µàµ¼à´?àµ?à´?àµ? à´?àµ?àµºà´«à´¿à´?à´±àµ?à´·àµ»"
 
@@ -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 "Shutdown"
+
+#: ../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 b5d9323587..0779bd8178 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 "à¤?à¤ªà¤£ à¤¤à¤°à¥?à¤¹à¥? 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 "à¤¨à¤¿à¤°à¥?à¤?à¤®à¤¨"
 
@@ -377,54 +377,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 8bce9c8d7d..69664d893b 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 "<h1>Bantu kami membaiki pepijat yang anda temui!</h1>\n<p>Baca <a href=\"%s\">arahan pelaporan pepijat kami</a>.</p>\n<p><strong>Jangan sertakan banyak maklumat peribadi\nkecuali yang diperlukan sahaja!</strong></p>\n<h2>Berkenaan penyerahan alamat emel kepada kami</h2>\n<p>\nDengan menyertakan alamat emel kami dapat menghubungi anda untuk\nmengesahkan masalah tersebut. Ia diperlukan bagi kebanyakan laporan\nyang kami terima kerana laporan-laporan tanpa maklumat perhubungan\ndianggap tidak berguna. Selain itu, ia memberi peluang kepada para\npengintip, iaitu alamat emel dan penyedia Internet anda, yang mahu tahu\natau mengesahkan sama ada anda pengguna 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 "Perisian Tambahan"
@@ -91,12 +91,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Anda mahu memulakan Electrum jua?"
 
 #: 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 "_Lancar"
 
 #: 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"
 
@@ -379,54 +379,58 @@ msgstr "Tambah"
 msgid "Back"
 msgstr "Kembali"
 
-#: 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 "Kata _Laluan Pentadbiran"
 
-#: 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 "Perdayaan Alamat _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 "Sambungan _Rangkaian"
 
-#: 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 "Terus (lalai)"
 
-#: 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 "Titi & Proksi"
 
-#: 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 "Luar Talian"
 
-#: 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 "Pengaktifan"
+
+#: 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 "Hidup (lalai)"
 
-#: 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 "Hidup"
 
-#: 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 "Mati"
 
-#: 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 "Mati (lalai)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Matikan"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Mula Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -463,28 +467,28 @@ msgstr "umount gagal dengan kod kembali {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "Membuka..."
 
-#: 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 "Buka"
 
-#: 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 "Tidak dapat buka storan tersulit dengan frasa laluan ini."
 
-#: 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 "_Bahasa"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "Bentangan _Papan Kekunci"
-
-#: 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 "_Format"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "Bentangan _Papan Kekunci"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -545,7 +549,7 @@ msgid "Passphrase can't be empty"
 msgstr "Frasa laluan tidak boleh dibiarkan kosong"
 
 #: 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 "Tunjuk Frasa Laluan"
 
@@ -653,78 +657,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Kekalkan fail yang disimpan di dalam direktori '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 "Tanda Buku Pelayar"
 
-#: 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 "Tanda buku telah disimpan di dalam Pelayar 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 "Sambungan Rangkaian"
 
-#: 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 "Konfigurasi peranti rangkaian dan sambungan"
 
-#: 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 "Perisian dipasang ketika memulakan 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 "Pencetak"
 
-#: 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 "Konfigurasi pencetak"
 
-#: 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 "Emel, suapan, dan tetapan 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 "Konfigurasi dan rantai kunci 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 "Klien 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 "Dompet dan konfigurasi bitcoin 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 "Profil Pidgin dan rantai kunci 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 "Klien 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 "Kunci SSH, konfigurasi dan hos yang dikenali"
 
-#: 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 "Pautan simbolik ke dalam setiap fail atau direktori $HOME ditemui dalam direktori 'dotfiles'"
@@ -741,7 +753,7 @@ msgstr "Persediaan volum berterusan 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 "Ralat"
 
@@ -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 "\"<b>Ingatan tidak mencukupi untuk memeriksa penataran.</b>\n\nPastikan sistem ini memenuhi keperluan untuk menjalankan Tails.\nSila rujuk file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nCuba mulakan semula Tails untuk memeriksa penataran sekali lagi.\n\nAtau buat penataran manual.\nSila rujuk 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 "ralat:"
 
@@ -1379,65 +1391,73 @@ msgstr "Tidak dapat menambah bekas fail%s: Had masa tamat ketika menunggu \npers
 msgid "Choose File Container"
 msgstr "Pilih Bekas Fail"
 
-#: 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 "Anda pasti mahu lancarkan Pelayar Tidak Selamat?"
 
-#: 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 "Aktiviti rangkaian di dalam Pelayar Tidak Selamat adalah <b>tidak awanama</b>.\\nHanya guna Pelayar Tidak Selamat jika perlu, sebagai contoh\\njika anda mahu daftar masuk atau daftar untuk aktifkan sambungan Internet anda."
 
-#: 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 "Memulakan Pelayar Tidak Selamat..."
 
-#: 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 "Ia mengambil sedikit masa, harap bersabar."
 
-#: 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 "Mematikan Pelayar Tidak Selamat..."
 
-#: 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 "Ia mengambil sedikit masa, dan anda tidak perlu mulakan semula Pelayar Tidak Selamat sehinggalah ia dimatikan dengan betul."
 
-#: 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 "Gagal memulakan semula 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 "Pelayar Tidak Selamat"
 
-#: 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 "Pelayar Tidak Selamat yang lain masih berjalan, atau baru ditutup. Cuba lagi kemudian."
 
-#: 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 "Gagal menyediakan 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 "Gagal mengkonfigur pelayar."
 
-#: 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 "Tiada pelayan DNS diperoleh melalui DHCP atau dikonfigur secara manual dalam Pengurus Rangkaian."
 
-#: 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 "Gagal menjalankan pelayar."
 
@@ -1530,7 +1550,7 @@ msgstr "Pengesahihan diperlukan untuk membuang satu pakej daripada perisian tamb
 
 #: ../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 "Kata Laluan Pentadbiran"
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr "Lumpuhkan"
 
 #: ../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 "Perdayaan Alamat MAC"
 
@@ -1575,7 +1595,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Jangan perdaya alamat-alamat 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 "Konfigurasi Rangkaian"
 
@@ -1598,52 +1618,81 @@ msgstr "Konfigur titi Tor atau proksi setempat"
 msgid "Disable all networking"
 msgstr "Lumpuhkan semua perangkaian"
 
+#: ../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 "Anda akan konfigur titi Tor dan proksi setempat kemudian selepas bersambung dengan rangkaian."
 
-#: ../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 "Selamat datang ke 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 "Bahasa & Wilayah"
 
-#: ../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 "Tetapan Lalai"
 
-#: ../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 "Storan _Berterusan Tersulit"
 
 #. 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 "Masukkan frasa laluan anda untuk membuka storan berterusan"
 
-#: ../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 "Storan berterusan anda tidak berkunci. Mulakan semula Tails untuk menguncinya semula."
 
-#: ../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 "Tetapan _Tambahan"
 
-#: ../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 "Tambah satu tetapan tambahan"
 
-#: ../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 "Tetapan lalai adalah selamat dalam semua keadaan. Untuk menambah satu tetapan suai, tekan butang \"+\" di bawah."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Matikan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Mula Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Bekas Fail"
diff --git a/my.po b/my.po
index 3fb0c96812..da0b54cd54 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,54 +375,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 ""
 
-#: 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 ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -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 ea0a519a6e..730238f54e 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 "<h1>Hjelp oss med Ã¥ ordne feilen du har funnet!</h1>\n<p>Les <a href=\"%s\">vÃ¥r instruks om rapportering av feil</a>.</p>\n<p><strong>Ikke inkluder flere personvernsdetaljer enn nÃ¸dvendig!</strong></p>\n<h2>Om det Ã¥ gi oss en e-post -adresse</h2>\n<p>\nDet Ã¥ gi oss en e-post -adresse tillater oss Ã¥ kontakte deg for Ã¥ fÃ¥ klarhet i problemet.\nDette er som oftest nÃ¸dvendig siden de fleste feilrettingsrapportene \ntrenger ytterligere detaljer for Ã¥ vÃ¦re brukbare.\nDog gir det ogsÃ¥ en mulighet for \novervÃ¥kningsinstanser, som din e-post eller Internettilbyder, til Ã¥ bekrefte at du bruker 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 "Tilleggsprogramvare"
@@ -102,12 +102,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Vil du starte Electrum uansett?"
 
 #: 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 "_Avslutt"
 
@@ -390,54 +390,58 @@ msgstr "Legg til"
 msgid "Back"
 msgstr "Tilbake"
 
-#: 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 "_Administrasjonspassord"
 
-#: 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 "Simulering av _MAC-adresse"
 
-#: 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 "_Nettverkstilkobling"
 
-#: 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 (forvalg)"
 
-#: 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 mellomtjener"
 
-#: 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 "Frakoblet"
 
-#: 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 "PÃ¥"
+
+#: 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 "PÃ¥ (forvalg)"
 
-#: 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 "Av"
 
-#: 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 "PÃ¥"
 
-#: 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 "Av (forvalg)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Skru av"
-
-#: 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 ""
@@ -474,28 +478,28 @@ msgstr "umount mislyktes med returkode {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "LÃ¥ser oppâ?¦"
 
-#: 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 opp"
 
-#: 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 opp kryptert lagring med denne passordsekvensen."
 
-#: 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 "_SprÃ¥k"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Tastaturoppsett"
-
-#: 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 "_Tastaturoppsett"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -556,7 +560,7 @@ msgid "Passphrase can't be empty"
 msgstr "Passordsekvensfeltet kan ikke stÃ¥ tomt"
 
 #: 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 passordsekvens"
 
@@ -664,78 +668,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Behold filer lagret i mappen `vedvarende'"
 
 #: 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 "Nettleser Bokmerker"
 
-#: 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 "Bokmerker lagret i Tor-nettleseren"
 
-#: 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 "Nettverkstilkoblinger"
 
-#: 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 "Oppsett av nettverksenheter og tilkoblinger"
 
-#: 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 "Programvare installert ved start av 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 "Skrivere"
 
-#: 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 "Skriveroppsett"
 
-#: 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-poster, feeder og innstillinger"
 
-#: 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Ã¸kkelringer, og oppsett"
 
-#: 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 "Electrum sin bitcoin-klient og oppsett av den"
 
-#: 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Ã¸kkelring"
 
-#: 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Ã¸kler, oppsett, og kjente verter"
 
-#: 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 "Dotfiler"
 
-#: 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 "Opp alle symbolsk lenke til til $HOME for hver av filene eller katalogene funnet i '.fil'-katalogen"
@@ -752,7 +764,7 @@ msgstr "Sett opp Tails med vedvarende lagring"
 #: 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 "Feil"
 
@@ -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 "feil:"
 
@@ -1392,65 +1404,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr "Velg 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 nettleseren?"
 
-#: 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 "Nettverkstrafikken i den usikre nettleseren er <b>ikke anonym</b>.\\nBruk kun den usikre nettleseren om absolutt nÃ¸dvendig, for eksempel\\nnÃ¥r du mÃ¥ logge inn eller registrere deg for Ã¥ aktivere internettforbindelsen din."
 
-#: 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 nettleserenâ?¦"
 
-#: 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 "Dette kan ta litt tid, sÃ¥ vÃ¦r 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 "Avslutter den usikre nettleserenâ?¦"
 
-#: 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 "Dette kan ta en stund, og den usikre nettleseren kan ikke startes pÃ¥ nytt fÃ¸r den forrige er helt avsluttet. "
 
-#: 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 starte 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 "Usikker nettleser"
 
-#: 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 annen usikker nettleser kjÃ¸rer for Ã¸yeblikket, eller blir renset. PrÃ¸v pÃ¥ nytt 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 "Mislyktes i Ã¥ opprette et chroot-miljÃ¸."
 
-#: 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 sette opp nettleser."
 
-#: 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-tjener ble tildelt gjennom DHCP eller manuelt oppsett 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 starte nettleser."
 
@@ -1543,7 +1563,7 @@ msgstr "Autentisering er pÃ¥krevd for Ã¥ fjerne en pakke fra dine tilleggsprogra
 
 #: ../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 "Administrasjonspassord"
 
@@ -1567,7 +1587,7 @@ msgid "Disable"
 msgstr "Skru av"
 
 #: ../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 "Simuler MAC-adresse"
 
@@ -1588,7 +1608,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Ikke simuler 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 "Nettverksoppsett"
 
@@ -1611,52 +1631,81 @@ msgstr "Sett opp en Tor-bro eller lokal mellomtjener"
 msgid "Disable all networking"
 msgstr "Skru av alle nettverk"
 
+#: ../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 vil sette opp Tor-broen og lokal mellomtjener senere etter Ã¥ ha koblet til et nettverk."
 
-#: ../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 "SprÃ¥k 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 "Forvalgte innstillinger"
 
-#: ../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 "Kryptert _vedvarende lagring"
 
 #. 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 "Skriv inn din passordsekvens for Ã¥ lÃ¥se opp det vedvarende lageret"
 
-#: ../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 "Ditt vedvarende lager er lÃ¥st opp. En omstart av Tails vil lÃ¥se det igjen."
 
-#: ../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 "_Ytterligere innstillinger"
 
-#: ../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 "Legg til ytterligere innstilling"
 
-#: ../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 "De forvalgte innstillingene er trygg i de fleste fall. For Ã¥ legge til en egendefinert innstilling, trykk \"+\"-knappen nedenfor."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Skru av"
+
+#: ../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/ne.po b/ne.po
index b2a2a16458..c9006ee5f8 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,54 +375,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 b049348125..ea45f13694 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@xxxxxxxxx>\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 "<h1>Help ons uw bug op te lossen!</h1>\n<p>Lees <a href=\"%s\">onze instructies voor het melden van bugs</a>.</p>\n<p><strong>Voeg niet meer persoonlijke gegevens toe dan\nnodig!</strong></p>\n<h2>Over het geven van een e-mailadres</h2>\n<p>\nDoor een e-mailadres op te geven, kunnen we contact met u opnemen om het probleem te\nverhelderen. Voor de overgrote meerderheid van rapporten die we ontvangen is dit nodig,\nomdat de meeste rapporten zonder contactgegevens nutteloos zijn. Anderzijds biedt het ook\neen gelegenheid voor afluisteraars, zoals uw e-mail- of internetprovider, om te bevestigen\ndat u Tails gebruikt.\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 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 "_Afsluiten"
 
@@ -404,54 +404,58 @@ msgstr "Toevoegen"
 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 "_Beheerderswachtwoord"
 
-#: 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-adresspoofing"
 
-#: 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 "Rechtstreeks (standaard)"
 
-#: 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 "Ingeschakeld"
+
+#: 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 "Aan (standaard)"
 
-#: 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 "Uit (standaard)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Uitschakelen"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "Tails _starten"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -488,28 +492,28 @@ msgstr "unmount mislukt met retourcode {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "Ontgrendelenâ?¦"
 
-#: 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 "Ontgrendelen"
 
-#: 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 versleutelde opslag niet ontgrendelen met deze wachtwoordzin."
 
-#: 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 "_Taal"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "Toetsen_bordindeling"
-
-#: 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 "_Indelingen"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "Toetsen_bordindeling"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -570,7 +574,7 @@ msgid "Passphrase can't be empty"
 msgstr "Wachtwoordzin kan niet leeg zijn"
 
 #: 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 "Wachtwoordzin tonen"
 
@@ -678,78 +682,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Bestanden bewaren in de map '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 "Browserbladwijzers"
 
-#: 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 "Bladwijzer opgeslagen in de 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 "Netwerkverbindingen"
 
-#: 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 "Configuratie van netwerkapparaten en -verbindingen"
 
-#: 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 "Te installeren software bij het starten van 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 "Printers"
 
-#: 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 "Printerconfiguratie"
 
-#: 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 en -instellingen"
 
-#: 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-sleutelhangers en -configuratie"
 
-#: 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-client"
 
-#: 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 bitcoinportemonnee en -configuratie"
 
-#: 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-profielen en OTR-sleutelhanger"
 
-#: 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-client"
 
-#: 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-sleutels, -configuratie en bekende hosts"
 
-#: 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-bestanden"
 
-#: 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 in $HOME voor alle bestanden of mappen aangetroffen in de map 'dotfiles'"
@@ -766,7 +778,7 @@ msgstr "Permanent volume voor Tails configureren"
 #: 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 "Fout"
 
@@ -869,7 +881,7 @@ msgid ""
 "{error}"
 msgstr "Importeren van sleutels vanuit {path} mislukt:\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] "Sleutel geÃ¯mporteerd"
@@ -877,7 +889,7 @@ msgstr[1] "Sleutels geÃ¯mporteerd"
 
 #. 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 "\"<b>Onvoldoende geheugen om op upgrades te controleren.</b>\n\nZorg ervoor dat dit systeem voldoet aan de vereisten voor het uitvoeren van Tails.\nZie file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProbeer Tails opnieuw op te starten om te controleren op upgrades.\n\nOf voer een handmatige upgrade uit.\nZie 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 "fout:"
 
@@ -1406,65 +1418,73 @@ msgstr "Kon bestandscontainer %s niet toevoegen: time-out tijdens wachten op 'lo
 msgid "Choose File Container"
 msgstr "Bestandscontainer kiezen"
 
-#: 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 "Wilt u echt de Onveilige 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 "Netwerkactiviteit in de Onveilige Browser is <b>niet anoniem</b>.\\nGebruik de Onveilige Browser alleen wanneer nodig, bijvoorbeeld\\nals u zich moet aanmelden of registreren om uw internetverbinding\\nte activeren."
 
-#: 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 "De Onveilige Browser starten..."
 
-#: 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 "Dit kan even duren, dus een ogenblik 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 "De Onveilige Browser afsluiten..."
 
-#: 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 "Dit kan enige tijd duren, en u mag de Onveilige Browser niet herstarten voordat deze juist is afgesloten."
 
-#: 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 "Het herstarten van Tor is mislukt."
 
-#: 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 "Onveilige 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 "Een andere Onveilige Browser is momenteel actief of wordt opgeruimd. Probeer het later opnieuw."
 
-#: 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 "Kon geen chroot maken."
 
-#: 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 "Kon de browser niet configureren."
 
-#: 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 "Geen DNS-server verkregen via DHCP of handmatig geconfigureerd in NetwerkBeheerder."
 
-#: 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 "Kon de browser niet starten."
 
@@ -1557,7 +1577,7 @@ msgstr "Er is authenticatie vereist om een pakket uit uw extra software te verwi
 
 #: ../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 "Beheerderswachtwoord"
 
@@ -1581,7 +1601,7 @@ msgid "Disable"
 msgstr "Uitschakelen"
 
 #: ../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-adresspoofing"
 
@@ -1602,7 +1622,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "MAC-adressen niet spoofen"
 
 #: ../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 "Een Tor-bridge of lokale proxy configureren"
 msgid "Disable all networking"
 msgstr "Alle netwerken uitschakelen"
 
+#: ../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 "De Tor-bridge en lokale proxy stelt u later in nadat u verbinding met een netwerk hebt gemaakt."
 
-#: ../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 "Welkom bij 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 "Taal & regio"
 
-#: ../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 "Standaardinstellingen"
 
-#: ../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 "Versleutelde _permanente opslag"
 
 #. 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 "Voer uw wachtwoordzin in om de permanente opslag te ontgrendelen"
 
-#: ../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 "Uw permanente opslag is ontgrendeld. Herstart Tails om de opslag opnieuw te vergrendelen."
 
-#: ../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 "Extr_a instellingen"
 
-#: ../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 "Extra instelling toevoegen"
 
-#: ../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 "De standaardinstellingen zijn veilig in de meeste situaties. Klik op de â??+â??-knop hieronder om een aangepaste instelling toe te voegen."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Uitschakelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "Tails _starten"
+
 #: ../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 e61fc0195c..109eea18b3 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 "Wilt u Electrum toch opstarten?"
 
 #: 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,54 +377,58 @@ msgstr "Toevoegen"
 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 ""
 
-#: 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 "Ingeschakeld"
+
+#: 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 ""
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlockingâ?¦"
 msgstr "Bezig met ontgrendelenâ?¦"
 
-#: 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 "Ontgrendelen"
 
-#: 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 "Passphrase kan niet leeg zijn"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Bewaarde bladwijzers in de 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 "Netwerk Connecties"
 
-#: 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 "Configuratie van de netwerkapparaten en connecties"
 
-#: 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 ""
 
-#: 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 "Printers"
 
-#: 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 "Printer configuratie"
 
-#: 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 "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 keyrings en configuratie"
 
-#: 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 "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 profielen en OTR Keyring"
 
-#: 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 Client"
 
-#: 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 keys, configuratie en known hosts"
 
-#: 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 ""
@@ -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 "Foutmelding:"
 
@@ -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 "foutmelding:"
 
@@ -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 "Wilt u echt de Unsafe 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 ""
 
-#: 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 "De Unsafe Browser opstarten"
 
-#: 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 "Dit kan even duren, geduld aub."
 
-#: 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 "Kan Tor niet herstarten"
 
-#: 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 "Onveilige 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 ""
 
-#: 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 "Uitschakelen"
 
 #: ../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 729f9d295c..09a49db903 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 "<h1>Hjelp oss med Ã¥ ordna insektet ditt!</h1>\n<p>Les <a href=\"%s\">insektsinnmeldingsrettleiingane vÃ¥re</a>.</p>\n<p><strong>Ikkje tak med fleire personlege upplysingar enn\nkva som er naudsynt!</strong></p>\n<h2>Um Ã¥ gjeva oss ei e-postadressa</h2>\n<p>\nÃ? gjeva oss ei e-postadressa lÃ¨t oss setja oss i samband med deg for Ã¥ fenga klÃ¥rleik i vansken. Dette trengst for det store fleirtalet av meldingane me mottek dÃ¥ dei fleste meldingar utan nokon sambandsupplysingar er unyttuge. PÃ¥ den andre sida gjev det Ã²g tjuvlyttarar soleis som e-post- eller internettÃ¥tbjodaren din eit hÃ¸ve Ã¥t Ã¥ stadfesta at du nyttar Halar.\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 ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Vil du starte Electrum likevel?"
 
 #: 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 "_Avslutt"
 
@@ -377,54 +377,58 @@ msgstr "Legg til"
 msgid "Back"
 msgstr "Tilbake"
 
-#: 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 "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 ""
 
-#: 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 "FrÃ¥kopla"
 
-#: 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 "Aktivert"
+
+#: 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 "PÃ¥ (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 "PÃ¥"
 
-#: 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 "Av"
 
-#: 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 "Av (standard)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: 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 ""
@@ -461,26 +465,26 @@ msgstr ""
 msgid "Unlockingâ?¦"
 msgstr "Fjernar blokkering"
 
-#: 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 "Fjern blokkering"
 
-#: 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 "Vis passord"
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Hald filer lagra i Â«PersistentÂ»-mappa"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Bokmerke lagra i Tor-nettlesaren"
 
-#: 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 "Nettverkstilkoplingar"
 
-#: 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 ""
 
-#: 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 "Skrivarar"
 
-#: 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 "Skrivaroppsett"
 
-#: 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 ""
 
-#: 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-nykelring og oppsett"
 
-#: 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 "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 ""
 
-#: 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 ""
 
-#: 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 "Feil"
 
@@ -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 "feil:"
 
@@ -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 "Vil du verkeleg starta den Utrygge Nettlesaren?"
 
-#: 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 "Nettverksverksemd i den Utrygge Nettlesaren er <b>ikkje anonym</b>.\\nNytt berre den Utrygge Nettlesaren um det er naudsynt, til dÃ¸mes\\num du treng Ã¥ logga inn eller melde deg inn for Ã¥ slÃ¥ pÃ¥ internettsambandet ditt."
 
-#: 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 Utrygge Nettlesaren..."
 
-#: 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 "Dette kan taka eit bel, so ver venleg og ver tolmodig."
 
-#: 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 "SlÃ¦r av den Utrygge Nettlesaren..."
 
-#: 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 "Dette kan taka eit bel, og du kann ikkje starta um den Utrygge Nettlesaren fyre han er heilt slegen av."
 
-#: 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 "Kunde ikkje starta Tor pÃ¥ nytt."
 
-#: 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 "Utrygg nettlesar"
 
-#: 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 annan Utrygg Nettlesar kÃ¸yrer allereie, eller vert rydda burt. Ver venelg og freist pÃ¥ nytt um eit bel."
 
-#: 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 "Kunde ikkje setja upp 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 "Kunde ikkje setja upp nettlesaren."
 
-#: 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 vart fenge gjennom DHCP eller sett upp for hand i NettverksHandsamar."
 
-#: 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 "Kunde ikkje kÃ¸yre nettlesaren."
 
@@ -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 "Adminiistrasjonspassord"
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr "SlÃ¥ av"
 
 #: ../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 "Nettverksoppsett"
 
@@ -1598,52 +1618,81 @@ msgstr ""
 msgid "Disable all networking"
 msgstr "SlÃ¥ av alle nettverksfunksjonar"
 
+#: ../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 "Velkomen 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 "SprÃ¥k 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 "Standard-innstillingar"
 
-#: ../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 "Shutdown"
+
+#: ../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 104260ff5e..9cbeb94b43 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,54 +375,58 @@ msgstr "Apondre"
 msgid "Back"
 msgstr "Precedent"
 
-#: 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 "FÃ²ra linha"
 
-#: 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 "I"
 
-#: 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 "O"
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 9ba4becc42..4f9d89b53f 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,54 +375,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 edd22aebdf..56ce377f84 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 "à¨?à¨²à¨¾à¨?(_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)"
 
@@ -376,54 +376,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 ""
 
-#: 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 ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -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 6c5d86ceff..83df3c73d5 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 "<h1>PomÃ³Å¼ nam naprawiÄ? bÅ?Ä?d!</h1>\n<p>Przeczytaj <a href=\"%s\">instrukcje zgÅ?aszania bÅ?Ä?dÃ³w</a>.</p>\n<p><strong>Nie podawaj wiÄ?cej prywatnych informacji o sobie niÅ¼ to konieczne!</strong></p>\n<h2>Podanie swojego adresu email</h2>\n<p>\nPoprzez podanie swojego adresu email dajesz nam szanse na skontaktowania siÄ? z TobÄ? i klaryfikacjÄ? problemu ktÃ³ry napotkaÅ?eÅ?. \nTo jest potrzebne w wiÄ?kszoÅ?ci przypadkÃ³w zgÅ?aszania bÅ?Ä?dÃ³w ktÃ³re otrzymujemy. \nBez jakichkolwiek danych kontaktowych zgÅ?aszane bÅ?Ä?dy sÄ? bezuÅ¼yteczne. \nAczkolwiek, podanie swojego adresu email daje moÅ¼liwoÅ?Ä? na podsÅ?uch, np. TwÃ³j dostawca email, lub dostawca internetu bÄ?dzie wiedziaÅ?, Å¼e uÅ¼ywasz Tails.\n</p>\n\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 "Dodatkowe oprogramowanie"
@@ -106,12 +106,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Mimo tego, czy chcesz uruchomiÄ? 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 "_Uruchom"
 
 #: 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 "_WyjÅ?cie"
 
@@ -394,54 +394,58 @@ msgstr "Dodaj"
 msgid "Back"
 msgstr "Wstecz"
 
-#: 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 "_HasÅ?o Administracyjne"
 
-#: 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 "_Spoofowanie adresÃ³w 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 "_PoÅ?Ä?czenie Sieciowe"
 
-#: 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 "PoÅ?Ä?cz (domyÅ?lny)"
 
-#: 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 "Mostek 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 "Poza zasiÄ?giem"
 
-#: 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 "Aktywny"
+
+#: 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 "WÅ?Ä?czony (domyÅ?lny)"
 
-#: 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 "WyÅ?Ä?czony (domyÅ?lny)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "WyÅ?Ä?czenie"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Uruchom Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -478,28 +482,28 @@ msgstr "umount zakoÅ?czyÅ? siÄ? bÅ?Ä?dem z kodem {returncode}:\n{stdout}\n{stder
 msgid "Unlockingâ?¦"
 msgstr "Odblokowanie ..."
 
-#: 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 "Odblokuj"
 
-#: 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 "Nie moÅ¼na odblokowaÄ? zaszyfrowanej pamiÄ?ci z tym hasÅ?em."
 
-#: 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 "_JÄ?zyk"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_UkÅ?ad Klawiatury"
-
-#: 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 "_Formaty"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_UkÅ?ad Klawiatury"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -560,7 +564,7 @@ msgid "Passphrase can't be empty"
 msgstr "HasÅ?o nie moÅ¼e byÄ? puste"
 
 #: 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Å¼ HasÅ?o"
 
@@ -668,78 +672,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Zachowaj pliki w katalogu `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 "ZakÅ?adki przeglÄ?darki"
 
-#: 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 "ZakÅ?adki zapisane w 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 "PoÅ?Ä?czenia sieciowe"
 
-#: 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 "Konfiguracja urzÄ?dzeÅ? i poÅ?Ä?czeÅ? sieciowych"
 
-#: 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 "Oprogramowanie zainstalowane podczas uruchamiania 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 "Drukarki"
 
-#: 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 "Konfiguracja drukarek"
 
-#: 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 "WiadomoÅ?ci e-mail, kanaÅ?y i ustawienia 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 "Zbiory kluczy i konfiguracja 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 "Klient 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 "Portfel Electrum Bitcoin i konfiguracja"
 
-#: 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 "Zestaw kluczy OTR i profile Pidgina"
 
-#: 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 "Klient 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 "Klucze, konfiguracja i znane hosty 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 "ZrÃ³b dowiÄ?zania w $HOME do kaÅ¼dego pliku lub katalogu znajdujÄ?cego siÄ? w katalogu `dotfiles'"
@@ -756,7 +768,7 @@ msgstr "Ustaw wolumen przechowywania danych 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 "BÅ?Ä?d"
 
@@ -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 "\"<b>Brak wystarczajÄ?cej iloÅ?ci dostÄ?pnej pamiÄ?ci aby sprawdziÄ? aktualizacje.</b>\n\nUpewnij siÄ?, Å¼e ten system speÅ?nia wymagania do uruchamiania Tails.\nZobacz file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nSprÃ³buj zrestartowaÄ? Tails aby sprawdziÄ? aktualizacje ponownie.\n\nLub wykonaj manualnÄ? aktualizacjÄ?.\nPatrz 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 "bÅ?Ä?d:"
 
@@ -1400,65 +1412,73 @@ msgstr "Nie moÅ¼na dodaÄ? kontenera plikÃ³w %s: Limit czasu podczas oczekiwania
 msgid "Choose File Container"
 msgstr "Wybierz kontener plikÃ³w"
 
-#: 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 "Czy jesteÅ? pewien, Å¼e chcesz uruchomiÄ? NiebezpiecznÄ? PrzeglÄ?darkÄ??"
 
-#: 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 "AktywnoÅ?Ä? sieciowa poprzez NiebezpiecznÄ? PrzeglÄ?darkÄ? <b>nie jest anonimowa</b>\\nWykorzystuj NiebezpiecznÄ? PrzeglÄ?darkÄ? tylko wtedy, gdy jest to potrzebne, na przykÅ?ad podczas logowania siÄ? lub rejestrowania celem aktywacji poÅ?Ä?czenia z internetem."
 
-#: 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 "Uruchamianie Niebezpiecznej PrzeglÄ?darki..."
 
-#: 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 "To moÅ¼e chwilÄ? potrwaÄ?, prosimy o cierpliwoÅ?Ä?."
 
-#: 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 "WyÅ?Ä?czanie Niebezpiecznej PrzeglÄ?darki..."
 
-#: 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 "To moÅ¼e chwilÄ? potrwaÄ?. Nie restartuj Niebezpiecznej PrzeglÄ?darki dopÃ³ki nie zostanie ona poprawnie wyÅ?Ä?czona."
 
-#: 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 "Nie udaÅ?o siÄ? zrestartowaÄ? Tor'a."
 
-#: 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 "Niebezpieczna PrzeglÄ?darka"
 
-#: 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 "Niebezpieczna PrzeglÄ?darka jest juÅ¼ uruchomiona albo aktualnie czyszczona. ProszÄ? sprÃ³buj ponownie za chwilÄ?."
 
-#: 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 "Nie udaÅ?o siÄ? skonfigurowaÄ? 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 "Nie udaÅ?o skonfigurowaÄ? siÄ? przeglÄ?darki."
 
-#: 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 "Nie otrzymano Å¼adnego serwera DNS poprzez DHCP ani z rÄ?cznej konfiguracji w 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 "Nie udaÅ?o uruchomiÄ? siÄ? przeglÄ?darki."
 
@@ -1551,7 +1571,7 @@ msgstr "Aby usunÄ?Ä? paczkÄ? z twojego dodatkiwego oprogramowania ($(command_lin
 
 #: ../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 "HasÅ?o Administracyjne"
 
@@ -1575,7 +1595,7 @@ msgid "Disable"
 msgstr "WyÅ?Ä?cz"
 
 #: ../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 "FaÅ?szowanie Adresu MAC"
 
@@ -1596,7 +1616,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Nie faÅ?szuj adresu 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 "Konfiguracja Sieci"
 
@@ -1619,52 +1639,81 @@ msgstr "Skonfiguruj mostek Tor lub lokalny serwer proxy"
 msgid "Disable all networking"
 msgstr "WyÅ?Ä?cz wszystkie poÅ?Ä?czenia sieciowe"
 
+#: ../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 "MoÅ¼esz skonfigurowaÄ? ustawienia mostka i lokalne proxy po wczeÅ?niejszym poÅ?Ä?czeniu z sieciÄ?."
 
-#: ../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 "Witaj w 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 "JÄ?zyk i Lokalizacja"
 
-#: ../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 "Ustawienia DomyÅ?lne"
 
-#: ../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 "Zaszyfrowany _PamiÄ?Ä? TrwaÅ?a"
 
 #. 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 "Wpisz Twoje hasÅ?o do odblokowania przechowania danych"
 
-#: ../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 "Twoja pamiÄ?Ä? trwaÅ?a jest odblokowana. Zrestartuj Tails aby zablokowaÄ? jÄ? ponownie."
 
-#: ../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 "_Dodatkowe Ustawienia"
 
-#: ../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 dodatkowe ustawienie"
 
-#: ../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 "Ustawienia domyÅ?lne sÄ? bezpieczne w wiÄ?kszoÅ?ci sytuacji. Aby dodaÄ? wÅ?asne ustawienie , kliknij \"+\" poniÅ¼ej."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "WyÅ?Ä?czenie"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Uruchom Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Kontenery plikÃ³w"
diff --git a/pt_BR.po b/pt_BR.po
index 0124f2e1c5..9a3da7bdd5 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@xxxxxxxxxxx>\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@xxxxxxxxxx>\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 "Software Adicional"
@@ -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 "Adicionar"
 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 "_Mascaragem de endereÃ§os 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 "_ConexÃ£o de Rede"
 
-#: 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 "Direta (padrÃ£o)"
 
-#: 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 "Habilitado"
+
+#: 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 "Ativar (padrÃ£o)"
 
-#: 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 "Ativar"
 
-#: 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 "Desativar"
 
-#: 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 "Desativar (padrÃ£o)"
 
-#: 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 "_Iniciar Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -485,28 +489,28 @@ msgstr "umount  nÃ£o pÃ´de retornar o cÃ³digo {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 "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 "A frase-senha nÃ£o pode ser vazia"
 
 #: 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 Frase secreta"
 
@@ -675,78 +679,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Manter os arquivos armazenados no diretÃ³rio '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 "Favoritos do Navegador"
 
-#: 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 "Favoritos salvos no navegador 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 "ConexÃµes de Rede"
 
-#: 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 "ConfiguraÃ§Ã£o de dispositivos e conexÃµes de rede"
 
-#: 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 instalado ao iniciar o 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 "Impressoras"
 
-#: 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 "ConfiguraÃ§Ã£o das impressoras"
 
-#: 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, notificaÃ§Ãµes e configuraÃ§Ãµes"
 
-#: 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 (Gnu Privacy Guard)"
 
-#: 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 "Chaveiros e configuraÃ§Ã£o do 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 "Cliente 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 "ConfiguraÃ§Ã£o et carteira de bitcoin 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 "Perfis do Pidgin e chaveiro OTR (Off-The-Record)"
 
-#: 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 "Cliente SSH (Secure SHell)"
 
-#: 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 "Chaves SSH, configuraÃ§Ãµes e servidores conhecidos"
 
-#: 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 "Arquivos de configuraÃ§Ã£o (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 "Criar um link em $HOME para todos os arquivos ou diretÃ³rios encontrados no diretÃ³rio `dotfiles`"
@@ -763,7 +775,7 @@ msgstr "Configurar o volume persistente do 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 "Erro"
 
@@ -866,7 +878,7 @@ msgid ""
 "{error}"
 msgstr "Falha ao importar chaves 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] "Chave importada"
@@ -874,7 +886,7 @@ msgstr[1] "Chaves importadas"
 
 #. 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 "NÃ£o foi possÃvel adicionar o contÃªiner de arquivos %s: Tempo limite e
 msgid "Choose File Container"
 msgstr "Escolha um Volume de Armazenagem de Arquivos"
 
-#: 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 "AutenticaÃ§Ã£o Ã© necessÃ¡ria para remover um pacote de seus softwares a
 
 #: ../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 "_Iniciar Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Volumes para Armazenagem de Arquivos"
diff --git a/pt_PT.po b/pt_PT.po
index f06d578db3..3af10bae93 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 "<h1>Ajude-nos a corrigir o erro!</h1>\n<p>Leia <a href=\"%s\">as nossas instruÃ§Ãµes para reportar erros</a>.</p>\n<p><strong>NÃ£o inclua mais informaÃ§Ã£o pessoal do que a\nnecessÃ¡ria!</strong></p>\n<h2>Sobre dar-nos um endereÃ§o de correio eletrÃ³nico</h2>\n<p>\nAo dar-nos um endereÃ§o de correio eletrÃ³nico permite-nos contactÃ¡-lo para clarificar o problema. Isto Ã© necessÃ¡rio para a grande maioria dos relatÃ³rios que nÃ³s recebemos, uma vez que sem informaÃ§Ã£o de contacto, eles sÃ£o inÃºteis. Por outro lado, este tambÃ©m proporciona uma oportunidade para escutas, tal como o seu provedor de correio eletrÃ³nico ou de Internet, para confirmarem que estÃ¡ a utilizar o 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 Adicionais"
@@ -92,12 +92,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Mesmo assim, deseja iniciar o 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 "_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,54 +380,58 @@ msgstr "Adicionar"
 msgid "Back"
 msgstr "Voltar"
 
-#: 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 "Palavra-passe 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 "Mascarar EndereÃ§o _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 "LigaÃ§Ã£o de _Rede"
 
-#: 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 "Direto (predefiniÃ§Ã£o)"
 
-#: 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 e 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 "Desligado"
 
-#: 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 "Ativado"
+
+#: 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 "Ativado (predefiniÃ§Ã£o)"
 
-#: 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 "Ativado"
 
-#: 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 "Desativado"
 
-#: 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 "Desativado (predefiniÃ§Ã£o)"
 
-#: 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 "_Iniciar o Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -464,28 +468,28 @@ msgstr "umount com o cÃ³digo de retorno {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "A desbloquearâ?¦"
 
-#: 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 Ã© possÃvel desbloquear o armazenamento encriptado com esta frase-senha"
 
-#: 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 "DisposiÃ§Ã£o do _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 "DisposiÃ§Ã£o do _Teclado"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -546,7 +550,7 @@ msgid "Passphrase can't be empty"
 msgstr "A frase senha nÃ£o pode estar em branco"
 
 #: 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 Frase-Senha"
 
@@ -654,78 +658,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Mantenha os ficheiros guardados na diretoria '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 "Marcadores do Navegador"
 
-#: 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 "Marcadores guardados no 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 "LigaÃ§Ãµes de Rede"
 
-#: 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 "ConfiguraÃ§Ã£o dos dispositivos e ligaÃ§Ãµes da rede"
 
-#: 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 instalado quando iniciar o 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 "Impressoras"
 
-#: 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 "ConfiguraÃ§Ã£o de impressoras"
 
-#: 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-mails do Thunderbird, feeds, e definiÃ§Ãµes "
 
-#: 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 "ConfiguraÃ§Ã£o e gestor de chaves 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 "Bitcoin - Cliente"
 
-#: 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 "ConfiguraÃ§Ã£o e carteira bitcoin 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 "Perfis Pidgin e gestor de chaves 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 - Cliente"
 
-#: 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 "Chaves SSH, configuraÃ§Ã£o e hospedeiros conhecidos"
 
-#: 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 "HiperligaÃ§Ã£o simbÃ³lica com $HOME de cada ficheiro ou diretoria encontrados na diretoria 'dotfiles'"
@@ -742,7 +754,7 @@ msgstr "Configurar o volume permanente do 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 "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 "\"<b>NÃ£o hÃ¡ memÃ³ria suficiente para procurar por atualizaÃ§Ãµes.</b>\n\nVerifique se o sistema cumpre os requerimentos para executar o Tails\nConsulte o file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nTente reiniciar o 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:"
 
@@ -1382,65 +1394,73 @@ msgstr "NÃ£o foi possÃvel adicionar o volume de ficheiros %s: Tempo de espera e
 msgid "Choose File Container"
 msgstr "Escolher Volume de Ficheiros"
 
-#: 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 "A atividade de rede no Navegador Inseguro <b>nÃ£o Ã© anÃ³nima</b>.\\nUtilize apenas o Navegador Inseguro se necessÃ¡rio, por exemplo,\\nse tiver que iniciar a sessÃ£o ou registar-se para ativar a sua ligaÃ§Ã£o Ã  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 "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 "Isto pode demorar algum tempo e nÃ£o deve reiniciar o Navegador Inseguro atÃ© que este tenha sido propriamente encerrado."
 
-#: 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 "JÃ¡ estÃ¡ em execuÃ§Ã£o outro Navegador Inseguro, ou a ser encerrado. Por favor, tente novamente daqui a pouco."
 
-#: 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 "NÃ£o foi possÃvel 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 "NÃ£o foi obtido nenhum servidor DNS atravÃ©s do DHCP ou configurado manualmente com o Gestor de Redes."
 
-#: 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Ã£o foi possÃvel executar o navegador."
 
@@ -1533,7 +1553,7 @@ msgstr "Ã? necessÃ¡ria a autenticaÃ§Ã£o para remover um pacote dos seus programa
 
 #: ../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 "Palavra-passe de AdministraÃ§Ã£o"
 
@@ -1557,7 +1577,7 @@ msgid "Disable"
 msgstr "Desativar"
 
 #: ../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 "Mascarar EndereÃ§o MAC"
 
@@ -1578,7 +1598,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"
 
@@ -1601,52 +1621,81 @@ msgstr "Configurar uma ponte Tor ou definiÃ§Ãµes de proxy"
 msgid "Disable all networking"
 msgstr "Desativar toda a 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 "IrÃ¡ configurar a ponte do Tor e o proxy local mais tarde apÃ³s ligar-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 "Bem-vindo 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 e 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 "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 "Armazenamento _Permanente Encriptado"
 
 #. 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 "Insira a sua frase-senha para desbloquear o armazenamento permanente"
 
-#: ../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 armazenamento permanente encontra-se desbloqueado. Reinicie o 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 "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 "Encerrar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Iniciar o Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Volumes de Ficheiros"
diff --git a/ro.po b/ro.po
index 86477c5f29..f54d592793 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,54 +394,58 @@ msgstr "AdaugÄ?"
 msgid "Back"
 msgstr "Ã?napoi"
 
-#: 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 "_ParolÄ? administrare"
 
-#: 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 "_Falsificare adresÄ? 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 "_Conexiune reÈ?ea"
 
-#: 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 "Direct (implicit)"
 
-#: 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 "Punte È?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 "Deconectat"
 
-#: 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 "Activat"
+
+#: 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 "Activat (implicit)"
 
-#: 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 "Activat"
 
-#: 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 "Dezactivat"
 
-#: 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 "Dezactivat (implicit)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Inchide"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_PorneÈ?te Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -478,28 +482,28 @@ msgstr "umount a eÈ?uat returnÃ¢nd eroarea {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "Se deblocheazÄ?..."
 
-#: 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 "DeblocaÅ£i"
 
-#: 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 "Deblocare imposibilÄ? a dispozitivului de stocare criptat cu aceastÄ? parolÄ?."
 
-#: 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 "_Limba"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Configurare tastaturÄ?"
-
-#: 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 "_Formaturi"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Configurare tastaturÄ?"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -560,7 +564,7 @@ msgid "Passphrase can't be empty"
 msgstr "Parola nu poate fi absentÄ?"
 
 #: 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 "AratÄ? parola"
 
@@ -668,78 +672,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "PÄ?streazÄ? fiÈ?ierele stocate in directorul '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 "Pagini Salvate in Navigator"
 
-#: 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 "Pagini salvate Ã®n navigatorul 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 "Conexiuni ReÈ?ea"
 
-#: 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 "Configurare plÄ?ci È?i conexiuni de reÈ?ea"
 
-#: 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 "AplicaÈ?ii instalate la pornirea 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 "Imprimante"
 
-#: 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 "Configurare imprimante"
 
-#: 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 "Email-uri, surse de È?tiri È?i setÄ?ri 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 "Chei È?i configurare 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 "Portofel bitcoin È?i configurare 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 "Profiluri Pidgin È?i chei 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 "Chei SSH, configuraÈ?ie si gazde cunoscute"
 
-#: 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 "AdaugÄ? o legÄ?turÄ? simbolicÄ? Ã®n $HOME pentru fiecare fiÈ?ier sau director gÄ?sit Ã®n directorul `dotfiles'"
@@ -756,7 +768,7 @@ msgstr "Configurare volum persistent 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 "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 "AdÄ?ugarea containerului a eÈ?uat%s: setarea iniÈ?ialÄ? a componentei lo
 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 "ParolÄ? administrare"
 
@@ -1573,7 +1593,7 @@ msgid "Disable"
 msgstr "DezactivaÅ£i"
 
 #: ../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 "Falsificare adresÄ? MAC"
 
@@ -1594,7 +1614,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Nu falsifica adresele 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 "Configurare reÈ?ea"
 
@@ -1617,52 +1637,81 @@ msgstr "ConfiguraÅ£i o punte Tor sau un proxy local"
 msgid "Disable all networking"
 msgstr "DezactivaÈ?i toate reÈ?elele"
 
+#: ../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 "VeÈ?i configura puntea Tor È?i proxy-ul local ulterior dupÄ? conectarea la reÈ?ea. "
 
-#: ../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 "Bun venit la 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 "LimbÄ? È?i Regiune"
 
-#: ../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 "SetÄ?ri implicite"
 
-#: ../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 "_Mediu Stocare PersistentÄ? Criptat"
 
 #. 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Å£i parola pentru deblocarea stocÄ?rii 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 "Mediul de stocare persistent este deblocat. ReporniÅ£i Tails pentru a-l bloca din nou."
 
-#: ../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 "_SetÄ?ri AdiÈ?ionale"
 
-#: ../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 "AdaugaÅ£i o setare adiÈ?ionalÄ?"
 
-#: ../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 "SetÄ?rile implicite sunt sigure Ã®n majoritatea cazurilor. Pentru a adÄ?uga o setare personalizatÄ?, apasaÅ£i pe butonul \"+\" de mai jos."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Inchide"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_PorneÈ?te Tails"
+
 #: ../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 419305614a..a99e5f2627 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@xxxxxxxxx>\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 "<h1>Ð?Ð¾Ð¼Ð¾Ð³Ð¸Ñ?Ðµ Ð½Ð°Ð¼ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð²Ð°Ñ?Ñ? Ð¾Ñ?Ð¸Ð±ÐºÑ?!</h1>\n<p>Ð?Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð¹Ñ?Ðµ<a href=\"%s\">Ð½Ð°Ñ?Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸ Ð¾ Ñ?Ð¾Ð¼, ÐºÐ°Ðº Ñ?Ð¾Ð¾Ð±Ñ?Ð°Ñ?Ñ? Ð¾Ð± Ð¾Ñ?Ð¸Ð±ÐºÐ°Ñ?</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 "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?ÐµÐ½Ð¸Ðµ"
@@ -117,12 +117,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 "_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"
 
@@ -405,54 +405,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 ""
@@ -489,28 +493,28 @@ msgstr "umount Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð» ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ {returncode}:\n{stdout}
 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 ""
@@ -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 "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 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 "Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: 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 "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 "Ð?Ð¸Ñ?ÐºÐ¾Ð¹Ð½-ÐºÐ¾Ñ?ÐµÐ»ÐµÐº Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ? 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 "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ?Ð½Ñ?Ðµ Ñ?Ñ?Ñ?Ð»ÐºÐ¸ Ð½Ð° ÐºÐ°Ð¶Ð´Ñ?Ð¹ Ñ?Ð°Ð¹Ð» Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÑ? $HOME Ð½Ð°Ð¹Ð´ÐµÐ½Ñ? Ð² Ð¿Ð°Ð¿ÐºÐµ `dotfiles'"
@@ -767,7 +779,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 "Ð?Ñ?Ð¸Ð±ÐºÐ°"
 
@@ -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 "\"<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 "Ð¾Ñ?Ð¸Ð±ÐºÐ°:"
 
@@ -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 "Ð?ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ñ?Ð¹ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? â?? Ñ?Ð¾Ñ?, ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ð¹ <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, Ð»Ð¸Ð±Ð¾ Ð½Ðµ Ð±Ñ?Ð» Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð²Ñ?Ñ?Ñ?Ð½Ñ?Ñ? Ñ?ÐµÑ?ÐµÐ· 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 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?."
 
@@ -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 "Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð°"
 
@@ -1607,7 +1627,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 "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ñ?ÐµÑ?Ð¸"
 
@@ -1630,52 +1650,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/si_LK.po b/si_LK.po
index b00a5ebf30..05abb23aa8 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,54 +375,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 ""
 
-#: 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 ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -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 "Browser Bookmarks"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+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: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 ""
 
-#: 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 "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 keyrings à·?à·? à·?à·?à¶±à·?â??à¶ºà·?à·?à¶º"
 
-#: 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 "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 keyring"
 
-#: 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 "`dotfiles' à¶±à·?à¶¸à·?à·?à¶½à·?à¶ºà·? à¶?à¶à·? à·?à·?à¶ºà·?à·? à¶?à·?à¶±à·? à·?à·? à¶±à·?à¶¸à·?à·?à¶½à·?  $HOME à·?à¶½à¶§ symlink à¶?à¶»à¶±à·?à¶±."
@@ -737,7 +749,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 "à¶¯à·?à·?à¶ºà¶?à·?"
 
@@ -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 88aac4f2d1..5b4c349de3 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@xxxxxxxxxx>\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 "<h1>PomÃ´Å¾te nÃ¡m opraviÅ¥ vaÅ¡u chybu!</h1>\n<p>Ä?Ãtajte <a href=\"%s\">naÅ¡e inÅ¡trukcie pre nahlÃ¡senie chyby</a>.</p>\n<p><strong>Nevkladajte viac osobnÃ½ch Ãºdajov ako je\nnevyhnutnÃ©!</strong></p>\n<h2>O poskytovanÃ emailovej adresy nÃ¡m</h2>\n<p>\nPoskytnutie emailovej adresy nÃ¡m umoÅ¾Å?uje kontaktovaÅ¥ vÃ¡s aby sme objasnili problÃ©m. Toto\nje potrebnÃ© pre obrovskÃ© mnoÅ¾stvo, vÃ¤Ä?Å¡ina \nhlÃ¡senÃ, ktorÃ© dostÃ¡vame, priÄ?om najviac bez akÃ½chkoÄ¾vek kontaktnÃ½ch Ãºdajov, je nepouÅ¾iteÄ¾nÃ¡. Na druhej strane to taktieÅ¾ poskytuje\nprÃleÅ¾itosÅ¥ Å¡pehom, ako vÃ¡Å¡mu emailovÃ©mu Ä?i internetovÃ©mu poskytovateÄ¾ovi,\nsi potvrdiÅ¥, Å¾e\npouÅ¾Ãvate 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 "Ä?alÅ¡Ã softvÃ©r"
@@ -95,12 +95,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Chcete spustiÅ¥ napriek tomu 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 "_SpustiÅ¥"
 
 #: 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Ä?iÅ¥"
 
@@ -383,54 +383,58 @@ msgstr "PridaÅ¥"
 msgid "Back"
 msgstr "SpÃ¤Å¥"
 
-#: 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 administrÃ¡tora"
 
-#: 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 "_Spoofovanie - predstieranie MAC adresy"
 
-#: 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 "_SieÅ¥ovÃ© pripojenie"
 
-#: 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 "Priame (PredvolenÃ©)"
 
-#: 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 "Premostenie a 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 "ZapnutÃ©"
+
+#: 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 "ZapnutÃ© (predvolenÃ©)"
 
-#: 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 "ZapnÃºÅ¥"
 
-#: 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 "VypnÃºÅ¥"
 
-#: 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 "VypnutÃ© (predvolenÃ©)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Vypnutie"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_ZapnÃºÅ¥ Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -467,28 +471,28 @@ msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "OdomykÃ¡m..."
 
-#: 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 "OdomknÃºÅ¥"
 
-#: 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 "NedÃ¡ sa odomknÃºÅ¥ Å¡ifrovanÃ© ÃºloÅ¾isko pomocou danÃ©ho hesla."
 
-#: 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 "_RozloÅ¾enie Klavesnice"
-
-#: 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 "_RegionÃ¡lny formÃ¡t"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_RozloÅ¾enie Klavesnice"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -549,7 +553,7 @@ msgid "Passphrase can't be empty"
 msgstr "PrÃstupovÃ© heslo nemÃ´Å¾e byÅ¥ prÃ¡zdne"
 
 #: 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 "UkÃ¡Å¾ heslo"
 
@@ -657,78 +661,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "PonechaÅ¥ sÃºbory uloÅ¾enÃ© v `Trvalom adresÃ¡ri'"
 
 #: 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 "ZÃ¡loÅ¾ky prehliadaÄ?a"
 
-#: 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 "ZÃ¡loÅ¾ky uloÅ¾enÃ© v PrehliadaÄ?i 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 "SieÅ¥ovÃ© pripojenia"
 
-#: 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 "KonfigurÃ¡cia sieÅ¥ovÃ½ch zariadenÃ a pripojenÃ"
 
-#: 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 "SoftvÃ©r inÅ¡talovanÃ½ pri spustenÃ 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 "TlaÄ?iarne"
 
-#: 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 "Nastavenia tlaÄ?iarnÃ"
 
-#: 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-maily, RSS zdroje a nastavenia z Thunderbirdu"
 
-#: 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 kÄ¾ÃºÄ?enky a nastavenia"
 
-#: 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 "Electrum bitcoin peÅ?aÅ¾enka a konfigurÃ¡cia"
 
-#: 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 profily a OTR kÄ¾ÃºÄ?enka"
 
-#: 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 kÄ¾ÃºÄ?e, konfigurÃ¡cia a znÃ¡me poÄ?itaÄ?e"
 
-#: 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 "VÅ¡etky sÃºbory alebo prieÄ?inky, ktorÃ© boli nÃ¡jdenÃ© v prieÄ?inku `dotfiles', symbolicky prepojiÅ¥ s $HOME."
@@ -745,7 +757,7 @@ msgstr "Nastavenie trvalÃ©ho oddielu 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 "Chyba"
 
@@ -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>Nie je dostatok voÄ¾nej pamÃ¤te pre kontrolu aktualizÃ¡cii.</b>\n\nUistite sa, Å¾e systÃ©m spÄºÅ?a vÅ¡etky poÅ¾iadavky nevyhnutnÃ© pre spustenie Tails.\nPozrite si sÃºbor file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nSkÃºste reÅ¡tartovaÅ¥ Tails a skontrolovaÅ¥ aktualizÃ¡cie znova.\n\nAlebo tak uÄ?inte manuÃ¡lne.\nViac informÃ¡cii 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 "chyba:"
 
@@ -1389,65 +1401,73 @@ msgstr "Nepodarilo sa pridaÅ¥ sÃºborovÃ½ kontajner %s: Ä?as vyprÅ¡al poÄ?as cykl
 msgid "Choose File Container"
 msgstr "ZvoÄ¾ sÃºborovÃ½ kontajner"
 
-#: 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 "Naozaj chcete spustiÅ¥ 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 "SieÅ¥ovÃ¡ aktivita v rÃ¡mci nezabezpeÄ?enÃ©ho prehliadaÄ?a <b>nie je anonymnÃ¡</b>.\\nPouÅ¾Ãvajte nezabezpeÄ?enÃ½ prehliadaÄ? len v prÃpade nutnosti, naprÃklad \\n ak sa musÃte prihlÃ¡siÅ¥ alebo registrovaÅ¥ kvÃ´li aktivÃ¡cii VÃ¡Å¡ho internetovÃ©ho spojenia."
 
-#: 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 "SpÃºÅ¡Å¥a sa 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 "Toto mÃ´Å¾e chvÃÄ¾u trvaÅ¥, buÄ?te preto prosÃm trpezlivÃ½."
 
-#: 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 "VypÃna sa Unsafe 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 "Toto mÃ´Å¾e chvÃÄ¾u trvaÅ¥, a pokiaÄ¾ sa korektne nevypne, nebudete ho mÃ´cÅ¥ reÅ¡tartovaÅ¥."
 
-#: 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 "Nepodarilo sa reÅ¡tartovaÅ¥ 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 "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 "AktuÃ¡lne je spustenÃ½ Ä?alÅ¡Ã Unsafe Browser, prÃpadne prebieha jeho Ä?istenie. ProsÃme skÃºste to znovu neskÃ´r."
 
-#: 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 "Nepodarilo sa nastaviÅ¥ 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 "Zlyhalo pri nastavovanÃ prehliadaÄ?a."
 
-#: 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 "Pomocou DHCP alebo konfigurÃ¡cie v NetworkManageri nebol zÃskanÃ½ Å¾iadny 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 "Zlyhalo pri spÃºÅ¡Å¥anÃ prehliadaÄ?a. "
 
@@ -1540,7 +1560,7 @@ msgstr "VyÅ¾adovanÃ¡ autentifikÃ¡cia pre ostrÃ¡nenie balÃÅ¡ku z VÃ¡Å¡ho doplnko
 
 #: ../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 sprÃ¡vcu"
 
@@ -1564,7 +1584,7 @@ msgid "Disable"
 msgstr "ZakÃ¡zaÅ¥"
 
 #: ../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 "Predstieranie MAC adresy"
 
@@ -1585,7 +1605,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "NespoofnuÅ¥ - nepredstieraÅ¥ vÅ¡etky 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 "Nastavenia siete"
 
@@ -1608,52 +1628,81 @@ msgstr "KonfigurovaÅ¥ Tor premostenie alebo miestne proxy."
 msgid "Disable all networking"
 msgstr "DeaktivovaÅ¥ vÅ¡etky siete"
 
+#: ../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 "NastavÃm Tor premostenie a miestne proxy neskÃ´r, po pripojenÃ do siete."
 
-#: ../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 "Vitajte 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 "Jazyk a 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 "PredvolenÃ© nastavenia"
 
-#: ../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Å¾isko"
 
 #. 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 "ZvoÄ¾te prÃstupovÃ© heslo na odomknutie trvalÃ©ho oddielu."
 
-#: ../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 "VaÅ¡e TrvalÃ© ÃºloÅ¾isko je odomknutÃ©. ReÅ¡tartujte Tails pre zamknutie."
 
-#: ../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 "_DodatoÄ?nÃ© nastavenia"
 
-#: ../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 "PridaÅ¥ dodatoÄ?nÃ© nastavenie"
 
-#: ../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 "PredvolenÃ© nastavenia sÃº bezpeÄ?nÃ© vo vÃ¤Ä?Å¡ine prÃpadov. Ak chcete upraviÅ¥ nastavenia stlaÄ?te \"+\" tlaÄ?idlo dolu."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Vypnutie"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_ZapnÃºÅ¥ Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "SÃºborovÃ© kontajnery"
diff --git a/sl.po b/sl.po
index dccf249181..7661ca6773 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@xxxxxxxxx>\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 "<h1>Pomagajte nam odpraviti vaÅ¡e napake!</h1>\n<p>Preberite <a href=\"%s\">navodila za prijavo napak</a>.</p>\n<p><strong>Prosimo vkljuÄ?ite samo bistvene podatke!</strong></p>\n<h2>O dajanju naslova e-naslova</h2>\n<p>\nDajanje e-naslova nam omogoÄ?a, da vas v zvezi s problemom kontaktiramo. To je potrebno za veliko veÄ?ino prijav, ki jih prejmemo. VeÄ?ina prijav brez kontaktnih informacij so neuporabna. Na drugi strani to zagotavlja priloÅ¾nost za prisluÅ¡kovalce, naprimer vaÅ¡ ponudnik e-naslova ali internetnih storitev, da potrdijo, da uporabljate 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 ""
@@ -88,12 +88,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Ali bi vseeno radi zagnali 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 "_Zagon"
 
 #: 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 "_Izhod"
 
@@ -376,54 +376,58 @@ msgstr "Dodaj"
 msgid "Back"
 msgstr "Nazaj"
 
-#: 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
+#: 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 "OmogoÄ?ena"
+
+#: 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 "Vklop"
 
-#: 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 "Izklop"
 
-#: 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 "Izklop"
-
-#: 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 ""
@@ -460,26 +464,26 @@ msgstr ""
 msgid "Unlockingâ?¦"
 msgstr "Odklepanje..."
 
-#: 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 "Geslo za kljuÄ?e ne sme biti prazno"
 
 #: 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 "Show Passphrase"
 
@@ -650,78 +654,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "ObdrÅ¾ite datoteke shranjene v `Trajen' imenik"
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Zaznamki shranjeni v Tor brskalniku"
 
-#: 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 "OmreÅ¾ne povezave"
 
-#: 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 "Nastavitve omreÅ¾nih naprav in povezav"
 
-#: 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 ""
 
-#: 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 "Tiskalniki"
 
-#: 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 "Nastavitev tiskalnikov"
 
-#: 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 "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 "Datoteke s kljuÄ?i GnuPG in nastavitve"
 
-#: 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 "Electrumova bitcoin denarnica in nastavitve"
 
-#: 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 in OTR datoteke s kljuÄ?i"
 
-#: 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 odjemalec"
 
-#: 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Ä?i, nastavitve in znani gostitelji"
 
-#: 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 "Datoteke s piko"
 
-#: 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 "Simbolna povezava $HOME vsaka datoteka ali imenik najden v imeniku `datoteke s piko'"
@@ -738,7 +750,7 @@ msgstr "Nastavitve  trajnega nosilca Sledi"
 #: 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 "Napaka"
 
@@ -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 "napaka:"
 
@@ -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 "ResniÄ?no Å¾elite zagnati nezanesljiv Brskalnik?"
 
-#: 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 "Zagon nezanesljivega Brskalnika ..."
 
-#: 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 "To lahko traja, zato bodite potrpeÅ¾jivi."
 
-#: 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 "UgaÅ¡anje nezanesljivega Brskalnika .."
 
-#: 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 "To lahko traja in ne smete ponoviti zagona nezanesljivega Brskalnika dokler ni pravilno ugasnjen."
 
-#: 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 "Ponoven zagon Tor-a neuspeÅ¡en. "
 
-#: 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 "Nezanesljiv Brskalnik"
 
-#: 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 "Drugi nezanesljiv Brskalnik se trenutno izvaja ali se Ä?isti. Poskusite malo kasneje. "
 
-#: 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 "NeuspeÅ¡na nastavitev 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 "Nastavljanje brskalnika neuspeÅ¡no."
 
-#: 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 "Noben DNS server ni bil pridobljen iz DHCP ali roÄ?no nastavljen v 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 "Zagon brskalnika neuspeÅ¡en."
 
@@ -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 "Privzete nastavitve"
 
-#: ../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 "Izklop"
+
+#: ../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 00be8e2f1d..3e007df84d 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,54 +375,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 7636227c0d..53fa924003 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@xxxxxxxxxxxxxxxxx>\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 "<h1>Na ndihmoni tÃ« ndreqim gabimin tuaj!</h1>\n<p>Lexoni <a href=\"%s\">instruksionet tona mbi raportimin e gabimit</a>.</p>\n<p><strong>Mos pÃ«rfshini mÃ« shumÃ« informacion mbi veten, sesa \nnevojitet</strong></p>\n<h2>Rreth tÃ« dÃ«rguarit tek ne tÃ« njÃ« adrese e-poste</h2>\n<p>\nDhÃ«nit tek ne e njÃ« adrese e-poste, na lejon tÃ« kontaktojmÃ« me ju pÃ«r tÃ« qartÃ«suar problemin. Kjo\nnevojitet pÃ«r shumicÃ«n e raporteve qÃ« ne marrim, pÃ«rderisa shumica e raporteve,\npa asnjÃ« informacion kontakti, janÃ« tÃ« papÃ«rdorshme. Nga ana tjetÃ«r, kjo gjÃ« ofron gjithashtu njÃ« mundÃ«si qÃ«\npÃ«rgjuesit, si ofruesi i e-postÃ«s apo Internetit tuaj, tÃ«\nkonfirmojnÃ« qÃ« ju po pÃ«rdorni 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 ""
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "DÃ«shironi ta nisni Electrum gjithsesi?"
 
 #: 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Ã«shoni"
 
 #: 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 "_Dilni"
 
@@ -377,54 +377,58 @@ msgstr "Shtoni"
 msgid "Back"
 msgstr "Mbrapa"
 
-#: 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 "_FjalÃ«kalimi i Administrimit"
 
-#: 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 "Ura & Proksi"
 
-#: 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 "I shkÃ«putur"
 
-#: 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 "E aktivizuar"
+
+#: 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 "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 ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Mbylleni"
-
-#: 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 ""
@@ -461,28 +465,28 @@ msgstr ""
 msgid "Unlockingâ?¦"
 msgstr "Duke Ã§kyÃ§ur..."
 
-#: 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 "Zhblloko"
 
-#: 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 "_Gjuha"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "Pamja e TastierÃ«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 "_Formatet"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "Pamja e TastierÃ«s"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr "Parulla s'mund tÃ« jetÃ« e zbrazÃ«t"
 
 #: 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 "Shfaq FrazÃ«kalimin"
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Mbajini skedarÃ«t e ruajtur nÃ« direktorinÃ« \"E vazhdueshme\""
 
 #: 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 "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:87
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "FaqeruajtÃ«sit e ruajtur nÃ« 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 "Lidhjet e Rrjetit"
 
-#: 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 "Konfigurimi i pajisjeve dhe lidhjeve tÃ« rrjetit "
 
-#: 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 ""
 
-#: 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 "Printerat"
 
-#: 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 "Konfigurimi i Printerave"
 
-#: 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 "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 "\"MbajtÃ«set e Ã§elÃ«save\" dhe konfigurimi i 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 " Portofoli Bitcoin i Electrum dhe konfigurimi"
 
-#: 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 "Profilet Pidgin dhe \"mbajtÃ«set e Ã§elÃ«save\" 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 "Klienti 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 "Ã?elÃ«sat SSH, konfigurimi dhe pritÃ«sit e njohur"
 
-#: 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 "Lidhni simbolikisht nÃ« $HOME Ã§do skedar ose direktori tÃ« gjetur nÃ« dirketorinÃ« e \"dotfiles\""
@@ -739,7 +751,7 @@ msgstr "Rregullimi vÃ«llimit tÃ« vazhdueshÃ«m tÃ« 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 "Gabim"
 
@@ -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 "gabim:"
 
@@ -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 "VÃ«rtet dÃ«shironi tÃ« lÃ«shoni Shfletuesin e Pasigurt?"
 
-#: 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 "Veprimtaria e rrjetit brenda Shfletuesit tÃ« Pasigurt <b>s'Ã«shtÃ« anonime</b>.\\nShfletuesin e Pasigurt pÃ«rdoreni vetÃ«m nÃ« rast nevoje, pÃ«r shembull\\nnÃ«se ju duhet tÃ« futeni ose tÃ« regjistroheni pÃ«r tÃ« aktivizuar lidhjen tuaj tÃ« Internetit."
 
-#: 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 "Duke nisur Shfletuesin e Pasigurt..."
 
-#: 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 "Kjo do tÃ« marrÃ« pak kohÃ«, ndaj ju lutemi jini i durueshÃ«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 "Duke mbyllur Shfletuesin e Pasigurt..."
 
-#: 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 "Kjo do tÃ« marrÃ« pak kohÃ« dhe ju mund tÃ« mos mundni qÃ« ta rinisni Shfletuesin e Pasigurt., derisa ai tÃ« mbyllet plotÃ«sisht."
 
-#: 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 "DÃ«shtuam pÃ«r rinisjen e 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 "Shfletues i Pasigurt"
 
-#: 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 "NjÃ« tjetÃ«r Shfletues i Pasigurt po ekzekutohet ose po pastrohet tani. Ju lutemi riprovoni pas pak."
 
-#: 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 "DÃ«shtim nÃ« konfigurimin e 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 "DÃ«shtim nÃ« konfigurimin e shfletuesit."
 
-#: 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 "AsnjÃ« shÃ«rbyes DNS nÃ« NetworkManager nuk Ã«shtÃ« pÃ«rftuar pÃ«rmes DHCP, ose konfigurimit me dorÃ«."
 
-#: 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 "DÃ«shtim nÃ« ekzekutimin e shfletuesit."
 
@@ -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 "FjalÃ«kalimi i Administrimit"
 
@@ -1554,7 +1574,7 @@ msgid "Disable"
 msgstr "Ã?aktivizoje"
 
 #: ../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 "Konfigurimi i Rrjetit"
 
@@ -1598,52 +1618,81 @@ msgstr "Konfiguro urÃ«n e Tor ose proxy lokal"
 msgid "Disable all networking"
 msgstr "Ã?'aktivizoni tÃ« gjitha rrjetet"
 
+#: ../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 "MirÃ«sevini nÃ« 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 "Gjuha & Zona"
 
-#: ../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 "Rregullimet e parazgjedhura"
 
-#: ../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 "_ParapÃ«lqime ShtesÃ«"
 
-#: ../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 "Shto njÃ« parapÃ«lqim shtesÃ«"
 
-#: ../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 "Mbylleni"
+
+#: ../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 937c65b3be..6b0e1b3d01 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 "<h1>Pomozite nam da ispravimo greÅ¡ku!</h1>\n\n<p>ProÄ?itajte <a href=\"%s\">naÅ¡e uputstvo za prijavljivanje greÅ¡ki</a>.</p>\n\n<p><strong>Ne unosite viÅ¡e liÄ?nih informacija od onoga Å¡to je neophodno!</strong></p>\n\n<h2>O tome da nam dajete adresu e-poÅ¡te</h2>\n\n<p>DajuÄ?i nam VaÅ¡u adresu e-poÅ¡te omoguÄ?avate nam da Vas kontaktiramo kako bismo razjasnili problem. To je potrebno za veliku veÄ?inu prijava koje primimo ali veÄ?ina njih dolazi nam bez kontakt informacija Å¡to je nama beskorisno za otklanjanje greÅ¡ke. U drugu ruku to moÅ¾e pruÅ¾iti moguÄ?nosti VaÅ¡em dobavljaÄ?u e-poÅ¡te ili Internet dobavljaÄ?u da potvrdi da koristite 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 "Dodatni softver"
@@ -91,12 +91,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Da li ipak Å¾elite da pokrenete 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 "_Ð?Ð·Ð»Ð°Ð·"
 
@@ -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 "_Administratorksa 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 ""
 
-#: 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 "Direktno (podrazumevano)"
 
-#: 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 "Ð?Ñ?Ð»Ð°Ñ?Ð½"
 
-#: 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 "Omoguceno"
+
+#: 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 (podrazumevano)"
 
-#: 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 (podrazumevano)"
 
-#: 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 "_Pokreni 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 "Nije moguÄ?e otkljuÄ?ati Å¡ifrovano skladiÅ¡te sa 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 Tastature"
-
-#: 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 Tastature"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -545,7 +549,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 "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
 
@@ -653,78 +657,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Ä?uvajte datoteke u `Trajnom` direktorijumu"
 
 #: 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 "ObeleÅ¾ivaÄ?i veb pregledaÄ?a"
 
-#: 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 "ObeleÅ¾ivaÄ?i saÄ?uvani u Tor pregledÄ?u"
 
-#: 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 "Konfiguracija 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 "Softver instaliran kada se pokreÄ?e 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 "Thunderberd mejlovi, izvori i podeÅ¡avanja"
 
-#: 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 keyrings i konfiguracija"
 
-#: 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 "Bitkoin 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 bitkoin novÄ?anik i konfiguracija"
 
-#: 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 keyring"
 
-#: 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, konfiguracija i poznati domaÄ?ini tj. hostovi"
 
-#: 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 (konfiguracioni fajlovi)"
 
-#: 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 "PoveÅ¾ite (symlink) u $HOME svaku datoteku ili direktorijum pronaÄ?enu u `dotfiles` direktorijumu"
@@ -741,7 +753,7 @@ msgstr "Podesite Tails trajnu particiju"
 #: 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"
 
@@ -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 "\"<b>Nije dostupno dovoljno memorije za proveru nadogradnji.</b>\n\nProverite da li ovaj sistem zadovoljava potrebne uslove za pokretanje Tails-a.\nVidi file:///usr/share/doc/tails/website/doc/about/requirements.en.htm\n\nPokuÅ¡ajte ponovo pokrenuti Tails za ponovnu proveru nadogradnji.\n\nIli izvrÅ¡ite ruÄ?nu nadogradnju.\nVidi 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:"
 
@@ -1383,65 +1395,73 @@ msgstr ""
 msgid "Choose File Container"
 msgstr "Odaberite spremiÅ¡te 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 "Da li stvarno Å¾elite da pokrenete nesigurni pregledaÄ??"
 
-#: 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 "Aktivnosti na mreÅ¾i koriÅ¡Ä?enjem nesigurnog pregledaÄ?a <b>nisu anonimne</b>.\nKoristite nesigurni pregledaÄ? samo ukoliko je to neophodno, na primer ukoliko je potrebno da se prijavite ili registrujete za povezivanje na 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 "Pokretanje nesigurnog pregledaÄ?a..."
 
-#: 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, molimo budite strpljivi."
 
-#: 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 "IskljuÄ?ivanje nesigurnog pregledaÄ?a..."
 
-#: 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 Ä?e moÅ¾da potrajati, nemojte ponovo pokretati nesigurni pregledaÄ? pre njegovog pravilnog iskljuÄ?enja."
 
-#: 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 "Ponovno pokretanje Tora je neuspeÅ¡no."
 
-#: 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 "Nesigurni pregledaÄ?"
 
-#: 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 "Drugi nesigurni pregledaÄ? je pokrenut ili se Ä?isti. Molimo pokuÅ¡ajte 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 "NeuspeÅ¡no izvrÅ¡avanje chroot komande."
 
-#: 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 "NeuspeÅ¡no konfigurisanje pregledaÄ?a."
 
-#: 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 server nije prikupljen putem DHCP-Ð° ili ruÄ?no konfigurisanog u NetworkManager-u."
 
-#: 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 "NeuspeÅ¡no pokretanje pregledaÄ?a."
 
@@ -1534,7 +1554,7 @@ msgstr "Potrebna je autentifikacija da bi uklonili paket iz VaÅ¡eg dodatnog soft
 
 #: ../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"
 
@@ -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 "Konfigurisanje mreÅ¾e"
 
@@ -1602,52 +1622,81 @@ msgstr "KonfiguriÅ¡i Tor most ili lokalni proxy"
 msgid "Disable all networking"
 msgstr "OnemoguÄ?i svako umreÅ¾avanje"
 
+#: ../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 "KonfigurisaÄ?eÅ¡ Tor most i lokalni proxy kasnije prilikom povezivanja 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 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 "Podrazumevana podeÅ¡avanja"
 
-#: ../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 "_Dodatna PodeÅ¡avanja"
 
-#: ../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 Dodatna podeÅ¡avanja"
 
-#: ../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 "Podrazumevana podeÅ¡avanja su najÄ?eÅ¡Ä?e sigurna. Za dodavanje prilagoÄ?enih podeÅ¡avanja pritisni \"+\" dugme koje se nalazi ispod."
 
+#: ../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 "_Pokreni Tails"
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "SpremiÅ¡ta datoteka"
diff --git a/sv.po b/sv.po
index 86089cce56..d832d201d7 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@xxxxxxxxx>\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,54 +392,58 @@ msgstr "LÃ¤gg till"
 msgid "Back"
 msgstr "Tillbaka"
 
-#: 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 "_AdministrationslÃ¶senord"
 
-#: 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 "_Fejka MAC-adress"
 
-#: 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Ã¤tverksanslutning"
 
-#: 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 "Direkt (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 & 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 "Nedkopplad"
 
-#: 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 "Aktiverad"
+
+#: 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 "PÃ¥ (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 "PÃ¥"
 
-#: 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 "Av"
 
-#: 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 "Av (standard)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "StÃ¤ng av"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
-msgid "_Start Tails"
-msgstr "_Starta Tails"
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -476,28 +480,28 @@ msgstr "umount misslyckades med felkod {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "LÃ¥ser upp..."
 
-#: 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 upp"
 
-#: 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 inte lÃ¥sa upp krypterad lagring med detta lÃ¶senord."
 
-#: 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 "_SprÃ¥k"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Tangentbordslayout"
-
-#: 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 "_Format"
 
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
+msgid "_Keyboard Layout"
+msgstr "_Tangentbordslayout"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -558,7 +562,7 @@ msgid "Passphrase can't be empty"
 msgstr "LÃ¶senordet fÃ¥r inte vara tomt"
 
 #: 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 "Visa lÃ¶senfras"
 
@@ -666,78 +670,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "BehÃ¥ll filer lagrade i katalogen `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 "WebblÃ¤sarens bokmÃ¤rken"
 
-#: 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 "BokmÃ¤rken sparade 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 "NÃ¤tverksanslutningar"
 
-#: 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 av nÃ¤tverksenheter och anslutningar"
 
-#: 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 "Programvara installerad nÃ¤r du startar 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 "Skrivare"
 
-#: 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 av skrivare"
 
-#: 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-post, flÃ¶den och instÃ¤llningar"
 
-#: 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 nyckelringar och 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 "Electrum's bitcoin plÃ¥nbok och 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 och OTR-nyckelring"
 
-#: 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-nycklar, konfiguration och kÃ¤nda vÃ¤rdar"
 
-#: 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 "Punktfiler"
 
-#: 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 "LÃ¤nka in i $HOME varje fil och katalog som finns i `dotfiles' katalogen"
@@ -754,7 +766,7 @@ msgstr "Konfigurera bestÃ¥ende lagring fÃ¶r 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 "Fel"
 
@@ -857,7 +869,7 @@ msgid ""
 "{error}"
 msgstr "Det gick inte att importera nycklar frÃ¥n {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] "Nyckel importerad"
@@ -865,7 +877,7 @@ msgstr[1] "Nycklar importerade"
 
 #. 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 "Det gick inte att lÃ¤gga till filbehÃ¥llaren %s: Tiden lÃ¶pte ut i vÃ¤nt
 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 "AdministrationslÃ¶senord"
 
@@ -1569,7 +1589,7 @@ msgid "Disable"
 msgstr "Inaktivera"
 
 #: ../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 "Fejka MAC-adress"
 
@@ -1590,7 +1610,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Fejka inte alla 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 "NÃ¤tverkskonfiguration"
 
@@ -1613,52 +1633,81 @@ msgstr "Konfigurera en Tor-bro eller lokal proxy"
 msgid "Disable all networking"
 msgstr "Inaktivera alla nÃ¤tverk"
 
+#: ../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 konfigurerar Tor-bron och lokal proxy senare efter anslutning till ett nÃ¤tverk."
 
-#: ../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Ã¤lkommen till 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 "SprÃ¥k & 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 "StandardinstÃ¤llningar"
 
-#: ../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 "Krypterad _bestÃ¥ende lagring"
 
 #. 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 "Mata in din lÃ¶senfras fÃ¶r att lÃ¥sa upp den bestÃ¥ende lagringen"
 
-#: ../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 "Din bestÃ¥ende lagring Ã¤r upplÃ¥st. Starta om Tails fÃ¶r att lÃ¥sa den 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 "_Ytterligare instÃ¤llningar"
 
-#: ../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 "LÃ¤gg till ytterligare instÃ¤llning"
 
-#: ../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 "StandardinstÃ¤llningarna Ã¤r sÃ¤kra i de flesta situationerna. FÃ¶r att lÃ¤gga till en anpassad instÃ¤llning, tryck pÃ¥ \"+\"-knappen nedan."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "StÃ¤ng av"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
+msgid "_Start Tails"
+msgstr "_Starta Tails"
+
 #: ../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 cc29b7bb61..8e15b6f103 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@xxxxxxxxx>\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,54 +375,58 @@ msgstr "Ongeza"
 msgid "Back"
 msgstr "Nyuma"
 
-#: 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 "nje ya mkondo"
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "kosa"
 
@@ -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 "Shutdown"
+
+#: ../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 97ba6116cf..d939f4bc76 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,54 +377,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 bd865da1a1..2e2dc4cd65 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 "<h1>Help us fix your bug!</h1>\n<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n<p><strong>Do not include more personal information than\nneeded!</strong></p>\n<h2>About giving us an email address</h2>\n<p>\nGiving us an email address allows us to contact you to clarify the problem. This\nis needed for the vast majority of the reports we receive as most reports\nwithout any contact information are useless. On the other hand it also provides\nan opportunity for eavesdroppers, like your email or Internet provider, to\nconfirm that you are using 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 "Additional Software"
@@ -87,12 +87,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Do you want to start Electrum anyway?"
 
 #: 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"
 
@@ -375,54 +375,58 @@ msgstr "Add"
 msgid "Back"
 msgstr "Back"
 
-#: 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 "_Administration Password"
 
-#: 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 Address 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 "_Network Connection"
 
-#: 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 "Direct (default)"
 
-#: 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 "_Unsafe Browser"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338
+msgid "Enabled"
+msgstr "Enabled"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340
+msgid "Disabled (default)"
+msgstr "Disabled (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391
 msgid "On (default)"
 msgstr "On (default)"
 
-#: 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 (default)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: 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 ""
@@ -459,28 +463,28 @@ msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
 msgid "Unlockingâ?¦"
 msgstr "Unlockingâ?¦"
 
-#: 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 "Unlock"
 
-#: 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 "Cannot unlock encrypted storage with this passphrase."
 
-#: 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 "_Language"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Keyboard Layout"
-
-#: 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 "_Keyboard Layout"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -541,7 +545,7 @@ msgid "Passphrase can't be empty"
 msgstr "Passphrase can't be empty"
 
 #: 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 "Show Passphrase"
 
@@ -649,78 +653,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Keep files stored in the `Persistent' directory"
 
 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Settings on the Welcome Screen"
+msgstr "Settings on the Welcome Screen"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Language, administration password, and additional settings"
+msgstr "Language, administration password, and additional settings"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Browser Bookmarks"
 msgstr "Browser Bookmarks"
 
-#: 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 "Bookmarks saved in the 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 "Network Connections"
 
-#: 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 of network devices and connections"
 
-#: 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 installed when starting 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 "Printers"
 
-#: 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 "Printers configuration"
 
-#: 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 emails, feeds, and settings"
 
-#: 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 keyrings and configuration"
 
-#: 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 Client"
 
-#: 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's bitcoin wallet and configuration"
 
-#: 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 profiles and OTR keyring"
 
-#: 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 Client"
 
-#: 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 keys, configuration and known hosts"
 
-#: 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 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
@@ -737,7 +749,7 @@ msgstr "Setup Tails persistent volume"
 #: 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"
 
@@ -840,7 +852,7 @@ msgid ""
 "{error}"
 msgstr "Failed to import keys from {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] "Key Imported"
@@ -848,7 +860,7 @@ msgstr[1] "Keys Imported"
 
 #. 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 "\"<b>Not enough memory available to check for upgrades.</b>\n\nMake sure this system satisfies the requirements for running Tails.\nSee file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nTry to restart Tails to check for upgrades again.\n\nOr do a manual upgrade.\nSee 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:"
 
@@ -1377,65 +1389,73 @@ msgstr "Could not add file container %s: Timeout while waiting for loop setup.\n
 msgid "Choose File Container"
 msgstr "Choose File Container"
 
-#: 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 "Do you really want to launch the 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 "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."
 
-#: 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 "Starting the 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 "This may take a while, so please be patient."
 
-#: 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 "Shutting down the Unsafe 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 "This may take a while, and you may not restart the Unsafe Browser until it is properly shut down."
 
-#: 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 "Failed to restart 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 "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 "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."
+
+#: 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 "Another Unsafe Browser is currently running, or being cleaned up. Please retry in a while."
 
-#: 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 "Failed to setup 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 "Failed to configure 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 "No DNS server was obtained through DHCP or manually configured in 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 "Failed to run browser."
 
@@ -1528,7 +1548,7 @@ msgstr "Authentication is required to remove a package from your additional soft
 
 #: ../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 "Administration Password"
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr "Disable"
 
 #: ../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 Address Spoofing"
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "Don't spoof MAC addresses"
 
 #: ../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 "Network Configuration"
 
@@ -1596,52 +1616,81 @@ msgstr "Configure a Tor bridge or local proxy"
 msgid "Disable all networking"
 msgstr "Disable all networking"
 
+#: ../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 "The Unsafe Browser allows you to log in to a captive portal.\n\nA 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\nThe Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
+msgid "Disable the Unsafe Browser (default)"
+msgstr "Disable the Unsafe Browser (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
+msgid "Enable the Unsafe Browser"
+msgstr "Enable the Unsafe Browser"
+
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid "Settings were loaded from the persistent storage."
+msgstr "Settings were loaded from the persistent storage."
+
+#: ../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 "You will configure the Tor bridge and local proxy later on after connecting to a network."
 
-#: ../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 "Welcome to 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 "Language & 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 "Default Settings"
 
-#: ../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 "Encrypted _Persistent Storage"
 
 #. 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 "Enter your passphrase to unlock the persistent storage"
 
-#: ../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 "Your persistent storage is unlocked. Restart Tails to lock it again."
 
-#: ../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 "_Additional Settings"
 
-#: ../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 "Add an additional setting"
 
-#: ../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 "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Shutdown"
+
+#: ../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 "File Containers"
diff --git a/te.po b/te.po
index daa8b2a57b..de474f6b27 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,54 +375,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Shutdown"
+
+#: ../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 ff1593cfc2..115a69e792 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@xxxxxxxxx>\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,54 +381,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 ""
 
-#: 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 "Shutdown"
-
-#: 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 ""
@@ -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 "Browser Bookmarks"
+msgstr ""
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+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: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 ""
 
-#: 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 "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 keyrings and configuration"
 
-#: 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 "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 ""
 
-#: 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 Client"
 
-#: 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 "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 ""
 
-#: 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 "à¸¢à¸´à¸?à¸?à¸µà¸?à¹?à¸à¸?à¸£à¸±à¸?à¸ªà¸¹à¹? 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 ""
 
-#: ../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 "Shutdown"
+
+#: ../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..732300be2e 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@xxxxxxxxx>\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 "Etkin"
+
+#: 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 dcf12f140d..5a2d1a453d 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 "<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 "Ð?Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð½Ðµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ?ÐµÐ½Ð½Ñ?"
@@ -98,12 +98,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 "_Ð?Ð¸Ñ?Ñ?Ð´"
 
@@ -386,54 +386,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 ""
@@ -470,28 +474,28 @@ msgstr "Ð½ÐµÐ²Ð´Ð°Ñ?Ð° Ð² umount, ÐºÐ¾Ð´ Ð¿Ð¾Ð²ÐµÑ?Ð½ÐµÐ½Ð½Ñ? {returncode}:\n{st
 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 ""
@@ -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 "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 "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 "Bitcoin-Ð³Ð°Ð¼Ð°Ð½ÐµÑ?Ñ? Ñ? ÐºÐ¾Ð½Ñ?Ñ?Ð³Ñ?Ñ?Ð°Ñ?Ñ?Ñ? 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 "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ?Ð½Ñ? Ð¿Ð¾Ñ?Ð¸Ð»Ð°Ð½Ð½Ñ? Ð´Ð¾ $HOME, Ð½Ð° ÐºÐ¾Ð¶ÐµÐ½ Ñ?Ð°Ð¹Ð» Ñ?Ð¸ Ð¿Ð°Ð¿ÐºÑ? Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ñ? Ð² Ð¿Ð°Ð¿Ñ?Ñ? `dotfiles '"
@@ -748,7 +760,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 "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ°"
 
@@ -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 "\"<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 "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°:"
 
@@ -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 "Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ð° Ð°ÐºÑ?Ð¸Ð²Ð½Ñ?Ñ?Ñ?Ñ? Ð?ÐµÐ±ÐµÐ·Ð¿ÐµÑ?Ð½Ð¾Ð³Ð¾ Ð?Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° <b>Ð½Ðµ Ð°Ð½Ð¾Ð½Ñ?Ð¼Ð½Ð°</b>. \\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 Ð°Ð±Ð¾ Ð½Ðµ Ð±Ñ?Ð² Ð½Ð°Ð»Ð°Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð²Ñ?Ñ?Ñ?Ð½Ñ? Ñ? 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 "Ð?Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ð¸ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?."
 
@@ -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 "Ð?Ñ?Ð´Ð¼Ñ?Ð½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð¸"
 
@@ -1588,7 +1608,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 "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð¼ÐµÑ?ÐµÐ¶Ñ?"
 
@@ -1611,52 +1631,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/ur.po b/ur.po
index aec27d8477..9618d5206c 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 "_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"
 
@@ -376,54 +376,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 ""
 
-#: 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 ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -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 "Disable"
 
 #: ../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 b652d00820..e7d16aeebe 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 "Qoâ??shish"
 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:340
+msgid "Disabled (default)"
 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:391
+msgid "On (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:393
+msgid "On"
 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:395
+msgid "Off"
 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: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 "Xato"
 
@@ -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 4a69a34794..c8dad39935 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 "<h1>HÃ£y giÃºp chÃºng tÃ´i sá»a lá»?i cá»§a báº¡n!</h1>\n<p>Ä?á»?c <a href=\"%s\"> nhá»¯ng hÆ°á»?ng dáº«n bÃ¡o cÃ¡o lá»?i cá»§a chÃºng tÃ´i</a>.</p>\n<p><strong>Ä?á»«ng kÃ¨m theo nhá»¯ng thÃ´ng tin cÃ¡ nhÃ¢n ngoÃ i nhá»¯ng thá»©\ncáº§n thiáº¿t!</strong></p>\n<h2>Vá»? viá»?c Ä?Æ°a Ä?á»?a chá»? email cho chÃºng tÃ´i</h2>\n<p>\nViá»?c Ä?Æ°a Ä?á»?a chá»? email cho phÃ©p chÃºng tÃ´i liÃªn há»? vá»?i báº¡n Ä?á»? lÃ m rÃµ váº¥n Ä?á»?. Viá»?c nÃ y\ncáº§n thiáº¿t Ä?á»?i vá»?i pháº§n lá»?n nhá»¯ng bÃ¡o cÃ¡o chÃºng tÃ´i nháºn Ä?Æ°á»£c vÃ¬ Ä?a sá»? nhá»¯ng bÃ¡o cÃ¡o\nkhÃ´ng cÃ³ báº¥t ká»³ thÃ´ng tin liÃªn láº¡c nÃ o Ä?á»?u lÃ  vÃ´ dá»¥ng. Máº·t khÃ¡c nÃ³ cÅ©ng cung cáº¥p\ncÆ¡ há»?i cho nhá»¯ng káº» nghe trá»?m, nhÆ° nhÃ  cung cáº¥p email hoáº·c Internet cá»§a báº¡n, Ä?á»?\nxÃ¡c nháºn ráº±ng báº¡n Ä?ang sá» dá»¥ng 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 "Pháº§n má»?m bá»? sung"
@@ -89,12 +89,12 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Báº¡n cÃ³ muá»?n khá»?i Ä?á»?ng Electrum dÃ¹ tháº¿ nÃ o Ä?i ná»¯a?"
 
 #: 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"
 
@@ -377,54 +377,58 @@ msgstr "ThÃªm vÃ o"
 msgid "Back"
 msgstr "LÃ¹i"
 
-#: 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 "_Administration Password"
 
-#: 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 Address 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 "_Network Connection"
 
-#: 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 "Trá»±c tiáº¿p (máº·c Ä?á»?nh)"
 
-#: 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 "Cáº§u ná»?i & á»¦y quyá»?n"
 
-#: 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 "Ngoáº¡i tuyáº¿n"
 
-#: 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 "Ä?Æ°á»£c báºt lÃªn"
+
+#: 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 "Má»? (máº·c Ä?á»?nh)"
 
-#: 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 "Báºt"
 
-#: 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 "táº¯t"
 
-#: 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 "Táº¯t (máº·c Ä?á»?nh)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
-msgid "Shutdown"
-msgstr "Táº¯t trÃ¬nh duyá»?t"
-
-#: 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 ""
@@ -461,28 +465,28 @@ msgstr "gá»¡ ra tháº¥t báº¡i vá»?i mÃ£ tráº£ vá»? {returncode}:\n{stdout}\n{stde
 msgid "Unlockingâ?¦"
 msgstr "Ä?ang má»? khÃ³a..."
 
-#: 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 "Má»? khÃ³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 "KhÃ´ng thá»? má»? khÃ³a vÃ¹ng lÆ°u trá»¯ bá»? mÃ£ hÃ³a vá»?i máºt kháº©u nÃ y."
 
-#: 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 "_Language"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
-msgid "_Keyboard Layout"
-msgstr "_Keyboard Layout"
-
-#: 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 "_Keyboard Layout"
+
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -543,7 +547,7 @@ msgid "Passphrase can't be empty"
 msgstr "Ä?oáº¡n máºt kháº©u khÃ´ng thá»? bá»? trá»?ng"
 
 #: 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 "Hiá»?n thá»? Ä?oáº¡n máºt kháº©u"
 
@@ -651,78 +655,86 @@ msgid "Keep files stored in the `Persistent' directory"
 msgstr "Giá»¯ cÃ¡c táºp tin Ä?Æ°á»£c lÆ°u trong thÆ° má»¥c `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 "Dáº¥u trang trÃ¬nh duyá»?t"
 
-#: 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 "Nhá»¯ng tháº» Ä?Ã¡nh dáº¥u Ä?Æ°á»£c lÆ°u trong TrÃ¬nh duyá»?t 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 "Nhá»¯ng káº¿t ná»?i máº¡ng lÆ°á»?i"
 
-#: 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 "Cáº¥u hÃ¬nh cá»§a nhá»¯ng thiáº¿t bá»? máº¡ng vÃ  káº¿t ná»?i"
 
-#: 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 "Pháº§n má»?m Ä?Ã£ Ä?Æ°á»£c cÃ i Ä?áº·t khi khá»?i Ä?á»?ng 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 "Nhá»¯ng mÃ¡y in"
 
-#: 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 "Cáº¥u hÃ¬nh cá»§a nhá»¯ng mÃ¡y in"
 
-#: 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 "ThÆ° Ä?iá»?n tá» Thunderbird, nguá»?n, vÃ  cÃ¡c cÃ i Ä?áº·t"
 
-#: 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 "Nhá»¯ng mÃ³c khÃ³a vÃ  cáº¥u hÃ¬nh 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 "MÃ¡y tráº¡m 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 "VÃ bitcoin Electrum vÃ  cáº¥u hÃ¬nh"
 
-#: 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 "Nhá»¯ng cáº¥u hÃ¬nh Pidgin vÃ  mÃ³c khÃ³a 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 "MÃ¡y tráº¡m 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 "Nhá»¯ng khÃ³a SSH, cáº¥u hÃ¬nh vÃ  nhá»¯ng mÃ¡y chá»§ Ä?Æ°á»£c biáº¿t Ä?áº¿n"
 
-#: 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 "Symlink vÃ o má»?i táºp tin hoáº·c thÆ° má»¥c $HOME Ä?Æ°á»£c tÃ¬m tháº¥y trong thÆ° má»¥c `dotfiles'"
@@ -739,7 +751,7 @@ msgstr "CÃ i Ä?áº·t á»? Ä?Ä©a bá»?n vá»¯ng cá»§a 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 "Lá»?i"
 
@@ -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 "lá»?i:"
 
@@ -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 "Báº¡n cÃ³ thá»±c sá»± muá»?n khá»?i cháº¡y TrÃ¬nh duyá»?t khÃ´ng an toÃ n?"
 
-#: 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 "Hoáº¡t Ä?á»?ng máº¡ng bÃªn trong TrÃ¬nh duyá»?t khÃ´ng an toÃ n <b> khÃ´ng áº©n danh </b>.\\n Chá»? sá» dá»¥ng trÃ¬nh duyá»?t khÃ´ng an toÃ n náº¿u cáº§n thiáº¿t, vÃ dá»¥\\n náº¿u báº¡n pháº£i Ä?Ä?ng nháºp hoáº·c Ä?Ä?ng kÃ½ Ä?á»? kÃch hoáº¡t káº¿t ná»?i 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 "Ä?ang báº¯t Ä?áº§u trÃ¬nh duyá»?t khÃ´ng an toÃ n..."
 
-#: 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 "Viá»?c nÃ y cÃ³ thá»? máº¥t chÃºt thá»?i gian, nÃªn hay kiÃªn nháº«n."
 
-#: 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 "Ä?ang táº¯t TrÃ¬nh duyá»?t khÃ´ng an toÃ n..."
 
-#: 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 "Viá»?c nÃ y cÃ³ thá»? máº¥t chÃºt thá»?i gian, vÃ  báº¡n cÃ³ thá»? khÃ´ng khá»?i Ä?á»?ng láº¡i TrÃ¬nh duyá»?t khÃ´ng an toÃ n cho tá»?i khi nÃ³ Ä?Æ°á»£c táº¯t chÃnh xÃ¡c."
 
-#: 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 "Tháº¥t báº¡i khi khá»?i Ä?á»?ng láº¡i 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 "TrÃ¬nh duyá»?t khÃ´ng an toÃ 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 "Má»?t TrÃ¬nh duyá»?t khÃ´ng an toÃ n khÃ¡c Ä?ang cháº¡y, hoáº·c Ä?ang Ä?Æ°á»£c dá»?n dáº¹p. Vui lÃ²ng thá» láº¡i trong chá»?c lÃ¡t."
 
-#: 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 "Tháº¥t báº¡i khi cÃ i Ä?áº·t 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 "Tháº¥t báº¡i khi cáº¥u hÃ¬nh trÃ¬nh duyá»?t."
 
-#: 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 "KhÃ´ng cÃ³ DNS server nÃ o láº¥y Ä?Æ°á»£c thÃ´ng qua DHCP hoáº·c cáº¥u hÃ¬nh thá»§ cÃ´ng trong 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 "Tháº¥t báº¡i khi cháº¡y trÃ¬nh duyá»?t."
 
@@ -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 "Máºt kháº©u Quáº£n trá»?"
 
@@ -1552,7 +1572,7 @@ msgid "Disable"
 msgstr "VÃ´ hiá»?u"
 
 #: ../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 "Sá»± lÃ m giáº£ Ä?á»?a chá»? MAC"
 
@@ -1573,7 +1593,7 @@ msgid "Don't spoof MAC addresses"
 msgstr "KhÃ´ng lÃ m giáº£ Ä?á»?a chá»? 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 "Cáº¥u hÃ¬nh máº¡ng lÆ°á»?i"
 
@@ -1596,52 +1616,81 @@ msgstr "Cáº¥u hÃ¬nh má»?t cáº§u ná»?i Tor hay má»?t Ä?áº¡i diá»?n (proxy) Ä?á»?a
 msgid "Disable all networking"
 msgstr "VÃ´ hiá»?u táº¥t cáº£ máº¡ng lÆ°á»?i"
 
+#: ../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 "Báº¡n sáº½ cáº¥u hÃ¬nh cáº§u ná»?i Tor vÃ  á»§y quyá»?n ná»?i bá»? sau khi káº¿t ná»?i tá»?i má»?t máº¡ng lÆ°á»?i."
 
-#: ../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 "ChÃ o má»«ng Ä?áº¿n vá»?i 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 "NgÃ´n ngá»¯ vÃ  VÃ¹ng"
 
-#: ../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 "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh"
 
-#: ../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 "Encrypted _Persistent Storage"
 
 #. 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 "Nháºp máºt kháº©u cá»§a báº¡n Ä?á»? má»? khÃ³a dung lÆ°á»£ng bá»?n vá»¯ng"
 
-#: ../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 "PhÃ¢n vÃ¹ng lÆ°u trá»¯ bá»?n vá»¯ng cá»§a báº¡n bá»? má»? khoÃ¡. Khá»?i Ä?á»?ng láº¡i Tails Ä?á»? khoÃ¡ nÃ³ láº¡i."
 
-#: ../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 "_Additional Settings"
 
-#: ../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 "ThÃªm má»?t cÃ i Ä?áº·t ná»¯a"
 
-#: ../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 "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh lÃ  an toÃ n trong háº§u háº¿t tÃ¬nh huá»?ng. Ä?á»? thÃªm nhá»¯ng cÃ i Ä?áº·t riÃªng, báº¥m nÃºt \"+\" bÃªn dÆ°á»?i."
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
+msgid "Shutdown"
+msgstr "Táº¯t trÃ¬nh duyá»?t"
+
+#: ../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 ""
diff --git a/zh_CN.po b/zh_CN.po
index c335f559f6..3179291f0b 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 2665675032..422ce2382c 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 "<h1>å¹«æ??å??ä¿®å¾©ç¨?å¼?é?¯èª¤ï¼?</h1>\n<p>é?±è®?<a href=\\\"%s\\\">é?¯èª¤å??å ±æ³¨æ??äº?é ?</a>.</p>\n<p><strong>å??å¥½å??å?«ä»»ä½?å??å¿?è¦?å??å??äººè³?æ??ï¼?</strong></p>\n<h2>é??æ?¼æ??ä¾?ä½ å??é?»é?µå?°å??</h2>\n<p>\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 ""
@@ -92,12 +92,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 "_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"
 
@@ -380,54 +380,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 ""
 
-#: 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 ""
-
 #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
@@ -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 "æª?æ¡?å??å?²å?å?°Persistentç?®é??"
 
 #: 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 "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: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 ""
 
-#: 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 "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å??Bitcoinæ¯?ç?¹å¹£é?¢å??å??è¨å®?"
 
-#: 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è¨å®?æª?å??å??è¨?é??å??å??"
 
-#: 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 "Symlinkã??dotfilesã??ç?®é??ä¸æ?µå?°å??æ¯?å??æª?æ¡?æ??ç?®é??å?°$HOME"
@@ -742,7 +754,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 "é?¯èª¤"
 
@@ -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 "ä½¿ç?¨å??å®?å?¨ç??è¦½å?¨å??ç¶²çµ¡æ´»å??ä¿?<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 "æ?ªç?±DHCPæ??NetworkManagerå??æ??å??è¨å®?å??å¾?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 "ç?¡æ³?é??å??ç??è¦½å?¨ã??"
 
@@ -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 995fe08c46..a8915daea4 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 "<h1>å¹«å?©æ??å??ä¿®å¾©æ?¨ç??ç¨?å¼?é?¯èª¤ï¼?</h1>\n<p>é?±è®?<a href=\"%s\">æ??å??ç??é?¯èª¤å??å ±è³?è¨?</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 "å?¶ä»?è»?é«?"
@@ -102,12 +102,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 "_é?¢é??"
 
@@ -390,54 +390,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 "ç¶²è·¯å?¡å¯¦é«?ä½?å??å?½è£?"
 
-#: 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 ""
@@ -474,28 +478,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 "èª?è¨?"
 
-#: 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 ""
@@ -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 "å°?æª?æ¡?å?²å?ã??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 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 "ç¶²è·¯é?£ç·?"
 
-#: 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' ç?®é??ä¸æ?¾å?°ç??æ¯?å??æª?æ¡?æ??ç?®é?? Symlink å?° $HOME "
@@ -752,7 +764,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 "é?¯èª¤"
 
@@ -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 "ã??<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 "é?¯èª¤:"
 
@@ -1390,65 +1402,73 @@ msgstr "ç?¡æ³?å? å?¥æª?æ¡?å®¹å?¨ %sï¼?ç?å¾? loop è¨å®?æ??é?¾æ??ã??\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å¦?æ??å¿?è¦?ï¼?è«?å??ä½¿ç?¨ä¸?å®?å?¨ç??ç??è¦½å?¨å?¨ä¸?äº?æ?¨å¿?é ?ç?»å?¥æ??è¨»å??ä¾?å??å??æ?¨ç??ç¶²é??ç¶²è·¯é?£ç·?ã??"
 
-#: 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 "æ²?æ?? DNS ä¼ºæ??å?¨æ?¯é??é?? 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 "ç?¡æ³?é??å??ç??è¦½å?¨"
 
@@ -1541,7 +1561,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 "ç®¡ç??å?¡å¯?ç¢¼"
 
@@ -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 "æ¡è¿?ä½¿ç?¨ 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 "æª?æ¡?å®¹å?¨"

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

Prev by Author: [tor-commits] [translation/liveusb-creator_completed] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator_completed
Next by Author: [tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
Previous by thread: [tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
Next by thread: [tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
Index(es):
- Author
- Thread